review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.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	4d82e9db422ec34793650a34c5f03edd7b0abbaf
tree	59a8eda6e6f11f6226c5910c6f41695b964ca03e	tree \| snapshot
parent	18c05faf8ab14913c8144108661efa8f17b10b5b	commit \| diff
parent	aa2c24e7f415e9c13635cee22ff4e15a80215551	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>

Domain: System / Kernel;

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