| commit | a8f808839abe3a10011e28b46af1848dfd8c4f21 | [log] [tgz] |
|---|---|---|
| author | Martin K. Petersen <martin.petersen@oracle.com> | Mon Jan 04 13:27:39 2021 -0500 |
| committer | Martin K. Petersen <martin.petersen@oracle.com> | Mon Jan 04 13:27:39 2021 -0500 |
| tree | 65b4e6b010132e5e8516fd349ddb8f8aa73dd2ac | |
| parent | e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 [diff] | |
| parent | 74a2921948ed8c0e7f079a98442ec3493168cc85 [diff] |
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 <martin.petersen@oracle.com>