diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-06 19:12:47 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-06 20:55:26 +0100 |
commit | 2d69d098e0c339ab594ccd54f74784d94e2c4a9a (patch) | |
tree | b826a3a879dcd38ebf58ba89a335036bcd85cdcf /target/linux/oxnas/patches-5.4/999-libata-hacks.patch | |
parent | 7bd583e5f31e5c42df47f0286b0dcbc6df30765e (diff) | |
download | upstream-2d69d098e0c339ab594ccd54f74784d94e2c4a9a.tar.gz upstream-2d69d098e0c339ab594ccd54f74784d94e2c4a9a.tar.bz2 upstream-2d69d098e0c339ab594ccd54f74784d94e2c4a9a.zip |
kernel: bump 5.4 to 5.4.182
The following patch was integrated upstream:
target/linux/bcm4908/patches-5.4/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch
All other updated automatically.
The new config option CONFIG_BPF_UNPRIV_DEFAULT_OFF is now handled too.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas/patches-5.4/999-libata-hacks.patch')
-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 cac7f48f43..d322514a7d 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); -@@ -5158,6 +5166,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5159,6 +5167,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); -@@ -5203,6 +5214,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5204,6 +5215,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); |