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

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

author	Martin K. Petersen <martin.petersen@oracle.com>
	Wed, 27 Jan 2021 02:36:54 +0000 (21:36 -0500)
committer	Martin K. Petersen <martin.petersen@oracle.com>
	Wed, 27 Jan 2021 02:52:58 +0000 (21:52 -0500)
commit	817023f0dfd0668154c591a353097954f11a04c0
tree	59a8eda6e6f11f6226c5910c6f41695b964ca03e	tree \| snapshot
parent	1b2a52b193ccea89893856b1152b4c57201170c4	commit \| diff
parent	78db602076f2d40fda856bbea167fd01150fa434	commit \| diff

Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue

The UFS core has received a substantial rework this cycle. This in
turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes
into 5.12/scsi-queue and resolve the conflict.

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

Linux Kernel Source Tree.

RSS Atom

Documentation/ABI/testing/sysfs-driver-ufs	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvfc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd.c	diff1 \|	diff2 \|	blob \| history