git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Martin K. Petersen <martin.petersen@oracle.com>
	Thu, 12 Aug 2021 02:37:22 +0000 (22:37 -0400)
committer	Martin K. Petersen <martin.petersen@oracle.com>
	Thu, 12 Aug 2021 02:37:22 +0000 (22:37 -0400)
commit	3c1a2b94932091dbd017c3cf3cbddf252df7dcec
tree	a99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d	tree \| snapshot
parent	420a7300a21c75f69483d123af2189b2c402e4e5	commit \| diff
parent	67f91b6eb9fb8727acc3ed75db806bbe922afa3c	commit \| diff

Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging

Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging
reported by sfr.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Linux Kernel Source Tree.

RSS Atom

drivers/scsi/ibmvscsi/ibmvfc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_scsih.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_scan.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sr.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_transport.c	diff1 \|	diff2 \|	blob \| history