aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-09-15 15:27:45 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2016-10-24 20:25:14 +0300
commit2fc3680dd066419576cb0129d0c1bd7618b90f1a (patch)
treef5956c394aedc3bb3a6a5f45e1d1ddc658d3dc58 /target/linux/oxnas/patches-4.1/999-libata-hacks.patch
parent06405df7a8da24b7d735b32454c7d3b1f2ebaabc (diff)
downloadupstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.gz
upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.bz2
upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.zip
kernel: update kernel 4.1 to version 4.1.34
Refresh patches for all targets supporting 4.1 and not marked broken. Compile-tested on all targets using 4.1 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Changes to generic/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch based on a90ee92337d60fd14b6431adcda9929b955f3408. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/oxnas/patches-4.1/999-libata-hacks.patch')
-rw-r--r--target/linux/oxnas/patches-4.1/999-libata-hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
index 7d6670be56..f4574da9ba 100644
--- a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
@@ -15,7 +15,7 @@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -4780,6 +4788,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4786,6 +4794,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
@@ -25,7 +25,7 @@
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
-@@ -4825,6 +4836,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4831,6 +4842,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);