www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e3f8ab0 27f6811)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 02:50:11 +0000 (12:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 02:50:11 +0000 (12:50 +1000)
commit	5fa148f4e0b7fa60fc89d743e6a96ccf570fb4b4
tree	df12d44f76ed17be995555f2bebdd767011ee48e	tree
parent	e3f8ab0eac1c458eb7cdc714ce52f5f570bc95f5	commit \| diff
parent	27f681116fdf776a05d643dee4de318ec0f368a4	commit \| diff

Merge remote-tracking branch 'scsi/for-next'

# Conflicts:
# drivers/scsi/st.c

14 files changed:

block/Kconfig	diff1 \|	diff2 \|	blob \| history
block/Makefile	diff1 \|	diff2 \|	blob \| history
block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/base/core.c	diff1 \|	diff2 \|	blob \| history
drivers/block/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/cxlflash/main.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_debug.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/st.c	diff1 \|	diff2 \|	blob \| history
drivers/target/loopback/tcm_loop.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.