]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
commitcf51a227520775c9a8cc5f11f0b329415ad1c9cb
tree2974b2a29f2e4a818163bfd22b94ea4c16d4d5bc
parent06f40164de0e5eae5c3fdc26dec594a9b4244aa5
parent15cfef8623a449d40d16541687afd58e78033be3
Merge remote-tracking branch 'scsi-mkp/for-next'

# Conflicts:
# drivers/target/iscsi/iscsi_target.c
drivers/scsi/ibmvscsi/ibmvfc.c