aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-03-06 19:12:47 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-06 20:55:26 +0100
commit2d69d098e0c339ab594ccd54f74784d94e2c4a9a (patch)
treeb826a3a879dcd38ebf58ba89a335036bcd85cdcf /target/linux/generic/pending-5.4/834-ledtrig-libata.patch
parent7bd583e5f31e5c42df47f0286b0dcbc6df30765e (diff)
downloadupstream-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/generic/pending-5.4/834-ledtrig-libata.patch')
-rw-r--r--target/linux/generic/pending-5.4/834-ledtrig-libata.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.4/834-ledtrig-libata.patch b/target/linux/generic/pending-5.4/834-ledtrig-libata.patch
index 2c876ae55e..2fbbb5461b 100644
--- a/target/linux/generic/pending-5.4/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-5.4/834-ledtrig-libata.patch
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -5151,6 +5164,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5152,6 +5165,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = qc->hw_tag = tag;
-@@ -6087,6 +6103,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -6088,6 +6104,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
-@@ -6122,6 +6141,12 @@ static void ata_host_release(struct kref
+@@ -6123,6 +6142,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link);
kfree(ap->slave_link);
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
-@@ -6585,7 +6610,23 @@ int ata_host_register(struct ata_host *h
+@@ -6586,7 +6611,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}