From: Martin K. Petersen Date: Mon, 4 Jan 2021 18:27:39 +0000 (-0500) Subject: Merge branch '5.11/scsi-postmerge' into 5.11/scsi-fixes X-Git-Tag: v5.11-rc3~2^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a8f808839abe3a10011e28b46af1848dfd8c4f21;p=linux-block.git Merge branch '5.11/scsi-postmerge' into 5.11/scsi-fixes Merge two commits that had dependencies on other 5.11 trees (the block and the irq trees respectively). - We reverted a megaraid_sas change in 5.10 due to missing block layer plumbing. Now that this is in place, reinstate the change. - The hisi_sas driver had a dependency on a driver core irq change that went in through Thomas' tree. Signed-off-by: Martin K. Petersen --- a8f808839abe3a10011e28b46af1848dfd8c4f21