diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-09 18:18:20 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-18 00:10:34 +0200 |
| commit | e0bdf839722659ded1ce2f827f04ec4d9be3c6fc (patch) | |
| tree | da9d261db6cbc5d4a5fac5d93da6978880807b2c /target/linux/oxnas | |
| parent | b4ea8e1089b6db4367d9bd40654d7b16590ae19f (diff) | |
| download | upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.gz upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.bz2 upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.zip | |
kernel: bump 5.4 to 5.4.191
Merged upstream:
apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch
Similar patch merged upstream:
bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch
Manually adapted:
layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch
Compile-tested: armvirt/64
Run-tested: armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-5.4/999-libata-hacks.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch index d322514a7d..931061701f 100644 --- a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); -@@ -5159,6 +5167,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5162,6 +5170,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -5204,6 +5215,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5207,6 +5218,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); |