git.osdn.net Git - uclinux-h8/linux.git/commit

(root) / uclinux-h8 / linux.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	87f77d37d398d92a9963890b14f336dc394f6fa0
tree	b5a2d5bd5c67642b9546c15c1a87fddaeb96c830	tree \| snapshot
parent	8c2d04551545d3722c1e6891ecce46f44c5406ec	commit \| diff
parent	69002c8ce914ef0ae22a6ea14b43bb30b9a9a6a8	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>

RSS Atom

About OSDN

Site Announce
About OSDN
Privacy
Terms of Use
Advertise

Find Software

Search
Find by Categories
Download Ranking
Project Ranking

Develop Software

Create Project/Chamber
What's new
Recently Registered Project
Chambers Map
API

Help

Help Docs
Contact Us
Report Abuse/spam

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