diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-04 11:34:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-04 11:34:39 +0000 |
commit | 94fab5804b6f68cf2c606b57866c2cb12306cbf2 (patch) | |
tree | 643feda132ba5907f45408bc191b4501a4918284 /target/linux/oxnas/patches-4.1/999-libata-hacks.patch | |
parent | 145a1573469c39ebeaedeab2a3df09dea5db85fc (diff) | |
download | master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.gz master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.bz2 master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.zip |
kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10
096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47104 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 4 |
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 3d9ec115f6..7d6670be56 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 -@@ -4796,6 +4804,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4780,6 +4788,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); -@@ -4841,6 +4852,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4825,6 +4836,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); |