Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 05:48:04 +0000 (16:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 05:48:04 +0000 (16:48 +1100)
commit3297f6a8cd0498b64b1fc47ec07837ac064b3636
tree922a7dbadb4cc07d1a3730a850bcaadbcf7eaff7
parent2c1e64a861c8f1ad8a70398e07aa086074b772aa
parentf6de306274ab69a8d60ed5490a88bef4a3aba850
Merge branch 'for-next' of git://git./linux/kernel/git/jejb/scsi.git

# Conflicts:
# block/blk-lib.c
# drivers/block/rnbd/rnbd-clt.c
33 files changed:
block/blk-core.c
block/blk-lib.c
block/blk-merge.c
block/blk-sysfs.c
block/blk-zoned.c
block/blk.h
block/bounce.c
drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_worker.c
drivers/block/rnbd/rnbd-clt.c
drivers/block/rnbd/rnbd-clt.h
drivers/block/rnbd/rnbd-proto.h
drivers/block/rnbd/rnbd-srv.c
drivers/md/dm-core.h
drivers/md/dm-crypt.c
drivers/md/dm-io.c
drivers/md/dm-rq.c
drivers/md/dm.c
drivers/md/md-multipath.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
drivers/scsi/mpi3mr/mpi3mr.h
drivers/scsi/qla2xxx/qla_def.h
drivers/scsi/scsi_debug.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
drivers/scsi/sg.c
include/linux/bio.h
include/linux/blk_types.h
include/linux/blkdev.h
include/linux/device-mapper.h