diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 15:28:55 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:45:56 +0200 |
| commit | 50f456b46cbae27ed13badfe7b2976cd01b67a57 (patch) | |
| tree | 9911069e0538585942fe2c16685e7ed3afbff674 /target/linux/generic/pending-5.4/834-ledtrig-libata.patch | |
| parent | 78cf3e53b1f4ea6428925302d78f743a693d5fb1 (diff) | |
| download | upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.gz upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.bz2 upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.zip | |
kernel: bump 5.4 to 5.4.150
Manually rebased:
generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
Removed upstreamed:
layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch
All others updated automatically.
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.patch | 8 |
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 b289a6526a..cb049af0a5 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 -@@ -5117,6 +5130,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5121,6 +5134,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; -@@ -6053,6 +6069,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -6057,6 +6073,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; -@@ -6088,6 +6107,12 @@ static void ata_host_release(struct kref +@@ -6092,6 +6111,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; } -@@ -6551,7 +6576,23 @@ int ata_host_register(struct ata_host *h +@@ -6555,7 +6580,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; } |