aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-14 06:15:08 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 15:10:22 +0100
commit43c0a12665eb22e7fc0ebbde47173a990291a40e (patch)
treeb7710b73569370c809b8780a8812446cd8b2c68f /target/linux/generic/pending-5.10/834-ledtrig-libata.patch
parent187c8f9153bee5deb8a1163ba2abcbc7bc9e229c (diff)
downloadupstream-43c0a12665eb22e7fc0ebbde47173a990291a40e.tar.gz
upstream-43c0a12665eb22e7fc0ebbde47173a990291a40e.tar.bz2
upstream-43c0a12665eb22e7fc0ebbde47173a990291a40e.zip
kernel: bump 5.10 to 5.10.85
Removed target for patch which does not exist: bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ipq806x/R7800* Run-tested: bcm2711/RPi4B, ipq806x/R7800* * Had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to build (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149) Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.10/834-ledtrig-libata.patch')
-rw-r--r--target/linux/generic/pending-5.10/834-ledtrig-libata.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch
index fddec74d96..e43a97bfe8 100644
--- a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-5.10/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
-@@ -4545,6 +4558,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4547,6 +4560,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;
-@@ -5323,6 +5339,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5325,6 +5341,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;
-@@ -5358,6 +5377,12 @@ static void ata_host_release(struct kref
+@@ -5360,6 +5379,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;
}
-@@ -5764,7 +5789,23 @@ int ata_host_register(struct ata_host *h
+@@ -5766,7 +5791,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;
}