aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-23 18:06:11 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-23 18:06:11 +0000
commit3c0f297c9afcef26911e979fdc4cd5fa23f50d9c (patch)
treec2e5b6b570d49579ccd21e645ef769cf42160ceb /target/linux/oxnas
parenta12740abec5805a0c7c73c14800fe9bf4419089f (diff)
downloadmaster-187ad058-3c0f297c9afcef26911e979fdc4cd5fa23f50d9c.tar.gz
master-187ad058-3c0f297c9afcef26911e979fdc4cd5fa23f50d9c.tar.bz2
master-187ad058-3c0f297c9afcef26911e979fdc4cd5fa23f50d9c.zip
kernel: update 4.1 to 4.1.6
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46713 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-4.1/999-libata-hacks.patch8
1 files changed, 4 insertions, 4 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 c298f7561e..3d9ec115f6 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
-@@ -4781,6 +4789,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4796,6 +4804,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);
-@@ -4826,6 +4837,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4841,6 +4852,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);
@@ -36,7 +36,7 @@
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
-@@ -902,6 +902,8 @@ struct ata_port_operations {
+@@ -905,6 +905,8 @@ struct ata_port_operations {
void (*qc_prep)(struct ata_queued_cmd *qc);
unsigned int (*qc_issue)(struct ata_queued_cmd *qc);
bool (*qc_fill_rtf)(struct ata_queued_cmd *qc);
@@ -45,7 +45,7 @@
/*
* Configuration and exception handling
-@@ -992,6 +994,9 @@ struct ata_port_operations {
+@@ -995,6 +997,9 @@ struct ata_port_operations {
void (*phy_reset)(struct ata_port *ap);
void (*eng_timeout)(struct ata_port *ap);