Merge branch 'misc' into for-next
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 14 Dec 2021 16:26:35 +0000 (11:26 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 14 Dec 2021 17:06:17 +0000 (12:06 -0500)
commit014adbc9a838772b265834a55cd7b13eb2665d7e
treee634ce886ee052e80087bc220c260e242bf471e6
parentfa0cac1b4033451c89af25075332a62401ada0b4
parent4437503bfbec2f02b41b2492520fe627715889a7
Merge branch 'misc' into for-next

Conflicts:
drivers/scsi/ufs/ufshcd.c
drivers/scsi/lpfc/lpfc_els.c
drivers/scsi/ufs/ufshcd-pci.c
drivers/scsi/ufs/ufshcd.c