From b26e34214c3d3aea9792c950d5e7fdb5bc5412b1 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 2 Apr 2017 10:29:55 +0200 Subject: kernel: update kernel 4.9 to 4.9.20 Signed-off-by: Hauke Mehrtens --- .../490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 6 ++---- target/linux/generic/patches-4.9/901-debloat_sock_diag.patch | 2 +- target/linux/generic/patches-4.9/902-debloat_proc.patch | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/patches-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 52a208aed3..e4f92379df 100644 --- a/target/linux/generic/patches-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -9,10 +9,8 @@ Signed-off-by: Daniel Golle drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) -Index: linux-4.9.17/drivers/mtd/ubi/build.c -=================================================================== ---- linux-4.9.17.orig/drivers/mtd/ubi/build.c -+++ linux-4.9.17/drivers/mtd/ubi/build.c +--- a/drivers/mtd/ubi/build.c ++++ b/drivers/mtd/ubi/build.c @@ -1212,6 +1212,49 @@ static struct mtd_info * __init open_mtd return mtd; } diff --git a/target/linux/generic/patches-4.9/901-debloat_sock_diag.patch b/target/linux/generic/patches-4.9/901-debloat_sock_diag.patch index dec8d2eeec..237bcea88b 100644 --- a/target/linux/generic/patches-4.9/901-debloat_sock_diag.patch +++ b/target/linux/generic/patches-4.9/901-debloat_sock_diag.patch @@ -25,7 +25,7 @@ obj-$(CONFIG_PROC_FS) += net-procfs.o --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -1455,9 +1455,11 @@ void sk_destruct(struct sock *sk) +@@ -1460,9 +1460,11 @@ void sk_destruct(struct sock *sk) static void __sk_free(struct sock *sk) { diff --git a/target/linux/generic/patches-4.9/902-debloat_proc.patch b/target/linux/generic/patches-4.9/902-debloat_proc.patch index aa85c6b9b8..37ce4c278e 100644 --- a/target/linux/generic/patches-4.9/902-debloat_proc.patch +++ b/target/linux/generic/patches-4.9/902-debloat_proc.patch @@ -173,7 +173,7 @@ goto err; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3083,6 +3083,8 @@ static __net_initdata struct pernet_oper +@@ -3089,6 +3089,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { -- cgit v1.2.3