aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-10-04 11:34:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-10-04 11:34:39 +0000
commit0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 (patch)
treed0a1a756d8b4469d550ffbd17f0c7dd8300ecb82 /target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch
parentdea417017edc6717e2662ab97b0af3d0b724d360 (diff)
downloadupstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.gz
upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.bz2
upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.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> SVN-Revision: 47104
Diffstat (limited to 'target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch')
-rw-r--r--target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch b/target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch
index ee7c118ef0..37e322ad8c 100644
--- a/target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch
+++ b/target/linux/generic/patches-4.1/960-decompress_unlzo_fix.patch
@@ -13,7 +13,7 @@
+#endif
--- a/lib/decompress_unlzo.c
+++ b/lib/decompress_unlzo.c
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
#include <linux/types.h>
#include <linux/lzo.h>