]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'fixes' into for-next
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 6 Apr 2021 06:27:07 +0000 (23:27 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 6 Apr 2021 06:27:07 +0000 (23:27 -0700)
 Conflicts:
drivers/target/iscsi/iscsi_target.c

1  2 
drivers/scsi/pm8001/pm8001_hwi.c
drivers/target/iscsi/iscsi_target.c

Simple merge
Simple merge