aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-10-04 11:34:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-10-04 11:34:39 +0000
commit94fab5804b6f68cf2c606b57866c2cb12306cbf2 (patch)
tree643feda132ba5907f45408bc191b4501a4918284 /target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch
parent145a1573469c39ebeaedeab2a3df09dea5db85fc (diff)
downloadmaster-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/generic/patches-4.1/656-skb_reduce_truesize-helper.patch')
-rw-r--r--target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch b/target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch
index 3a59c3966d..72e5c26d80 100644
--- a/target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch
+++ b/target/linux/generic/patches-4.1/656-skb_reduce_truesize-helper.patch
@@ -14,7 +14,7 @@ when needed.
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2076,6 +2076,24 @@ static inline void pskb_trim_unique(stru
+@@ -2072,6 +2072,24 @@ static inline void pskb_trim_unique(stru
BUG_ON(err);
}