diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-15 11:32:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-18 20:25:06 +0200 |
| commit | 060aa0021f688d455767b553cfe95e29b6559b7a (patch) | |
| tree | 159034c8560900cbf6eedde93b4c6c64bbfc331c /target/linux/oxnas | |
| parent | 32f8c6fdf8770568b40bc85687091de99713c1b3 (diff) | |
| download | upstream-060aa0021f688d455767b553cfe95e29b6559b7a.tar.gz upstream-060aa0021f688d455767b553cfe95e29b6559b7a.tar.bz2 upstream-060aa0021f688d455767b553cfe95e29b6559b7a.zip | |
kernel: bump 5.4 to 5.4.219
Merged upstream:
bcm53xx/patches-5.4/083-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch
Compile-tested: x86/64
Run-tested: x86/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 931061701f..954d00c2a9 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); -@@ -5162,6 +5170,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5166,6 +5174,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); -@@ -5207,6 +5218,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5211,6 +5222,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); |