aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-02-08 09:36:38 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2018-02-08 18:43:13 +0100
commit3072908d0d946e38928e477fc6c32b952c7afc22 (patch)
treee50a1c27e1e08c4cb6f3c66d88d66b91b40c3c70 /target/linux/generic/pending-4.14/834-ledtrig-libata.patch
parent787326b43e332b378899205294b1d92ea77a45d4 (diff)
downloadupstream-3072908d0d946e38928e477fc6c32b952c7afc22.tar.gz
upstream-3072908d0d946e38928e477fc6c32b952c7afc22.tar.bz2
upstream-3072908d0d946e38928e477fc6c32b952c7afc22.zip
kernel: bump 4.14 to 4.14.18
Refresh patches. Remove upstreamed patches: - apm821xx/010-crypto-gcm-add-GCM-IV-size-constant.patch - backport/040-crypto-fix-typo-in-KPP-dependency-of-CRYPTO_ECDH.patch Remove pending-4.14/650-pppoe_header_pad.patch, it is superseded by upstream commit d32e5740001972c1bb193dd60af02721d047a17e. Update patch that no longer applies: hack/204-module_strip.patch Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.14/834-ledtrig-libata.patch')
-rw-r--r--target/linux/generic/pending-4.14/834-ledtrig-libata.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch b/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
index 8597a936f5..1ceffc5a29 100644
--- a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-4.14/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
-@@ -5089,6 +5102,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5090,6 +5103,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 = tag;
-@@ -5991,6 +6007,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5992,6 +6008,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;
-@@ -6012,6 +6031,12 @@ static void ata_host_release(struct devi
+@@ -6013,6 +6032,12 @@ static void ata_host_release(struct devi
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;
}
-@@ -6458,7 +6483,23 @@ int ata_host_register(struct ata_host *h
+@@ -6459,7 +6484,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;
}