diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-06 13:44:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-06 20:37:47 +0100 |
| commit | 9ced994057ae8243445d3f22aa981753de4f7d34 (patch) | |
| tree | 47fe012570c075f9d1551bcfc6660bf8af2239f6 /target/linux/oxnas | |
| parent | 5ecc7ead48783136569a541d59398e08767fd8bc (diff) | |
| download | upstream-9ced994057ae8243445d3f22aa981753de4f7d34.tar.gz upstream-9ced994057ae8243445d3f22aa981753de4f7d34.tar.bz2 upstream-9ced994057ae8243445d3f22aa981753de4f7d34.zip | |
kernel: bump 4.14 to 4.14.269
All patches refreshed automagically without conflicts.
Compile-tested: lantiq/xrx200, armvirt/64
Run-tested: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-4.14/999-libata-hacks.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch index 77d4728f5b..d223ac469f 100644 --- a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -5166,6 +5174,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5167,6 +5175,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); -@@ -5211,6 +5222,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5212,6 +5223,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); |