aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-04-02 10:29:55 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-04-02 12:47:55 +0200
commitb26e34214c3d3aea9792c950d5e7fdb5bc5412b1 (patch)
tree13d996bbc90294072e7e07c41ae68241ac2c538d /target/linux/generic/patches-4.9
parent97e6b67291036451683cb94ee6b91d07fdd10af5 (diff)
downloadupstream-b26e34214c3d3aea9792c950d5e7fdb5bc5412b1.tar.gz
upstream-b26e34214c3d3aea9792c950d5e7fdb5bc5412b1.tar.bz2
upstream-b26e34214c3d3aea9792c950d5e7fdb5bc5412b1.zip
kernel: update kernel 4.9 to 4.9.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/patches-4.9')
-rw-r--r--target/linux/generic/patches-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch6
-rw-r--r--target/linux/generic/patches-4.9/901-debloat_sock_diag.patch2
-rw-r--r--target/linux/generic/patches-4.9/902-debloat_proc.patch2
3 files changed, 4 insertions, 6 deletions
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 <daniel@makrotopia.org>
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)
{