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

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

author	Martin K. Petersen <martin.petersen@oracle.com>
	Fri, 17 Dec 2021 03:38:19 +0000 (22:38 -0500)
committer	Martin K. Petersen <martin.petersen@oracle.com>
	Fri, 17 Dec 2021 03:38:19 +0000 (22:38 -0500)
commit	1be1375b8ef7a7dea1009463e2c40d8ecdab8ecf
tree	b5a2d5bd5c67642b9546c15c1a87fddaeb96c830	tree \| snapshot
parent	c81f37249c01388e0a30e1b7f621bd7771efb93f	commit \| diff
parent	9b43d0143c80a21c5a6a500374106c854777ef15	commit \| diff

Merge branch '5.16/scsi-fixes' into 5.17/scsi-staging

Pull in the 5.16 fixes branch to resolve a conflict in the UFS driver
core.

Conflicts:
drivers/scsi/ufs/ufshcd.c

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

Linux Kernel Source Tree.

RSS Atom

drivers/scsi/lpfc/lpfc_els.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/pm8001/pm8001_init.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshpb.c	diff1 \|	diff2 \|	blob \| history