aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-07-09 12:18:49 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-07-09 17:03:10 +0200
commit0051fff1711849d061f01dcf0aa486f60df1e50a (patch)
tree6512eac6736f51e8951321471d263d1590705f90 /target/linux/generic/hack-4.14
parentb31f9190c3c9736f0f2a9fc810eba5b6f43a6b05 (diff)
downloadupstream-0051fff1711849d061f01dcf0aa486f60df1e50a.tar.gz
upstream-0051fff1711849d061f01dcf0aa486f60df1e50a.tar.bz2
upstream-0051fff1711849d061f01dcf0aa486f60df1e50a.zip
kernel: bump 4.14 to 4.14.132
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14')
-rw-r--r--target/linux/generic/hack-4.14/901-debloat_sock_diag.patch2
-rw-r--r--target/linux/generic/hack-4.14/902-debloat_proc.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
index 36d69c1dfd..118b1a79c6 100644
--- a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
-@@ -1596,9 +1608,11 @@ void sk_destruct(struct sock *sk)
+@@ -1593,9 +1605,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk)
{
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 8e7d6ac9ff..12809bb1be 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
-@@ -3382,6 +3382,8 @@ static __net_initdata struct pernet_oper
+@@ -3379,6 +3379,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{