aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-06-26 14:45:12 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-06-26 18:20:37 +0200
commit84d489f64f3b382d5544e342f66d8806e94e85d3 (patch)
treedca318969c99733fc177e8564ccad33beb4d2c58 /target/linux/octeon
parent3bf35126733a4b4073c1d3388e226c2a8f79d65b (diff)
downloadupstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.gz
upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.bz2
upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.zip
kernel: update to version 4.4.14
Changelog: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.14 Some manual changes to target/linux/generic/patches-4.4/610- netfilter_match_bypass_default_checks.patch were needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/octeon')
-rw-r--r--target/linux/octeon/patches-4.4/170-cisco-hack.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/octeon/patches-4.4/170-cisco-hack.patch b/target/linux/octeon/patches-4.4/170-cisco-hack.patch
index 6e49100e6a..b975eef5f0 100644
--- a/target/linux/octeon/patches-4.4/170-cisco-hack.patch
+++ b/target/linux/octeon/patches-4.4/170-cisco-hack.patch
@@ -18,7 +18,7 @@ Signed-off-by: MichaƂ Osowiecki <michal.osowiecki@gmail.com>
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
-@@ -944,6 +944,10 @@
+@@ -944,6 +944,10 @@ void __init plat_mem_setup(void)
if (mem_alloc_size > MAX_MEMORY)
mem_alloc_size = MAX_MEMORY;