]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:55:31 +0000 (17:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:55:31 +0000 (17:55 +1000)
commit9a9dfa9ca213d26ceaf9a38299b2c63a1f5ed2b3
tree5dff3321d71e517315f4462b5579db17c3f68a12
parentea75a22d13356eaf6bd2aea5132ae57eb4b04527
parentf92141e18c8b466027e226f3388de15b059b6f65
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git

# Conflicts:
# block/blk-settings.c
# include/linux/blkdev.h
21 files changed:
MAINTAINERS
block/blk-settings.c
drivers/ata/libata-scsi.c
drivers/ata/libata.h
drivers/ata/pata_macio.c
drivers/ata/sata_mv.c
drivers/scsi/hisi_sas/hisi_sas_main.c
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
drivers/scsi/hosts.c
drivers/scsi/ipr.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/mpi3mr/mpi3mr_app.c
drivers/scsi/pmcraid.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_scan.c
drivers/ufs/core/ufshcd.c
drivers/ufs/host/ufs-qcom.c
drivers/usb/storage/uas.c
include/linux/blkdev.h
include/linux/libata.h
include/scsi/scsi_host.h