aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-02-23 06:58:46 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-01 21:38:36 +0100
commit0989b7ad3a38345bc09a535782884d78ec195c9d (patch)
treee973e013e2f06be560dd49098415a8c4b465589a /target/linux/generic/pending-5.10/834-ledtrig-libata.patch
parenta2d4b5711aa73d14ffbc4f90a7944473b80baecb (diff)
downloadupstream-0989b7ad3a38345bc09a535782884d78ec195c9d.tar.gz
upstream-0989b7ad3a38345bc09a535782884d78ec195c9d.tar.bz2
upstream-0989b7ad3a38345bc09a535782884d78ec195c9d.zip
kernel: bump 5.10 to 5.10.102
Removed upstreamed: bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.102&id=f333c1916fd6b55900029bf8f918cc00009e2111 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 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 e43a97bfe8..25cffb1444 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
-@@ -4547,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4548,6 +4561,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;
-@@ -5325,6 +5341,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5326,6 +5342,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;
-@@ -5360,6 +5379,12 @@ static void ata_host_release(struct kref
+@@ -5361,6 +5380,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;
}
-@@ -5766,7 +5791,23 @@ int ata_host_register(struct ata_host *h
+@@ -5767,7 +5792,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;
}