projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e71ba94
74a2921
)
Merge branch '5.11/scsi-postmerge' into 5.11/scsi-fixes
author
Martin K. Petersen
<martin.petersen@oracle.com>
Mon, 4 Jan 2021 18:27:39 +0000
(13:27 -0500)
committer
Martin K. Petersen
<martin.petersen@oracle.com>
Mon, 4 Jan 2021 18:27:39 +0000
(13:27 -0500)
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>
1
2
drivers/scsi/hisi_sas/hisi_sas.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/hisi_sas/hisi_sas_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/megaraid/megaraid_sas_base.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/scsi/hisi_sas/hisi_sas.h
Simple merge
diff --cc
drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge
diff --cc
drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge