]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'scsi-mkp/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 07:22:16 +0000 (17:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 07:22:16 +0000 (17:22 +1000)
# Conflicts:
# drivers/target/iscsi/iscsi_target.c

1  2 
drivers/scsi/ibmvscsi/ibmvfc.c

Simple merge