aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/902-debloat_proc.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 11:03:25 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 18:17:32 +0100
commit3662157d8beda32d95fdc039da0b8114c0c2bb7b (patch)
tree0ffeb568ffc471b47e3633e736e1e801676ef066 /target/linux/generic/hack-4.14/902-debloat_proc.patch
parent662b92614699164396aa38b18f4510333ba64f1d (diff)
downloadupstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.gz
upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.bz2
upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.zip
kernel: bump 4.14 to 4.14.96
Refreshed all patches. Remove upstreamed patches: - 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/hack-4.14/902-debloat_proc.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch
index 092f0aa81b..3475a57014 100644
--- a/target/linux/generic/hack-4.14/902-debloat_proc.patch
+++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch
@@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -3381,6 +3381,8 @@ static __net_initdata struct pernet_oper
+@@ -3382,6 +3382,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{