aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/git-resolve.sh
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2025-09-05 21:26:03 +0000
committerLinus Torvalds <[email protected]>2025-09-05 21:26:03 +0000
commitd3e45016f75e3efc2366e9060241d38e3fd03a8f (patch)
treedfcdcb0cd9ec453dc7c9321a6384519e12d44911 /scripts/git-resolve.sh
parentMerge tag 'spi-fix-v6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentscsi: sr: Reinstate rotational media flag (diff)
downloadkernel-d3e45016f75e3efc2366e9060241d38e3fd03a8f.tar.gz
kernel-d3e45016f75e3efc2366e9060241d38e3fd03a8f.zip
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "Obvious driver patch plus update to sr to add back rotational media flag since CDROMS are rotational" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: sr: Reinstate rotational media flag scsi: lpfc: Fix buffer free/clear order in deferred receive path
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions