From c0a2da80f26a0055ac6e550660784eac2c845730 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 6 Apr 2020 01:32:37 +0800 Subject: [PATCH] kernel: bump 4.9 to 4.9.218 Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- .../backport-4.9/090-net-generalize-napi_complete_done.patch | 2 +- target/linux/generic/hack-4.9/220-gc_sections.patch | 2 +- .../generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch | 4 ++-- target/linux/generic/hack-4.9/901-debloat_sock_diag.patch | 2 +- target/linux/generic/hack-4.9/902-debloat_proc.patch | 2 +- ...20-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7c95fc19b8..1eb4c3d0ca 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .217 +LINUX_VERSION-4.9 = .218 LINUX_VERSION-4.14 = .175 LINUX_VERSION-4.19 = .114 -LINUX_KERNEL_HASH-4.9.217 = 6fb2a54602ebf750a39ba9750dc8d3bc34308518647f5bd2f562dee4d2566819 +LINUX_KERNEL_HASH-4.9.218 = df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd LINUX_KERNEL_HASH-4.14.175 = cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c LINUX_KERNEL_HASH-4.19.114 = 1e40a0dc6afc95a259f97b80d5f5ef8f89e2ee49e993ba6844e2bc55de361f0e diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 393cbbabb6..712348c835 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -803,7 +803,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -2702,11 +2702,9 @@ static int mvneta_poll(struct napi_struc +@@ -2701,11 +2701,9 @@ static int mvneta_poll(struct napi_struc rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]); } diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch index e795d666df..bdacb0f3ed 100644 --- a/target/linux/generic/hack-4.9/220-gc_sections.patch +++ b/target/linux/generic/hack-4.9/220-gc_sections.patch @@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos --- a/Makefile +++ b/Makefile -@@ -402,6 +402,11 @@ KBUILD_LDFLAGS_MODULE = -T $(srctree)/sc +@@ -402,6 +402,11 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s GCC_PLUGINS_CFLAGS := CLANG_FLAGS := diff --git a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch index 3a71f68b8b..96373d8994 100644 --- a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch +++ b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch @@ -34,7 +34,7 @@ Signed-off-by: Etienne Champetier @@ -295,6 +295,8 @@ struct net_bridge u16 group_fwd_mask; u16 group_fwd_mask_required; - + + bool disable_eap_hack; + /* STP */ @@ -45,7 +45,7 @@ Signed-off-by: Etienne Champetier @@ -169,6 +169,30 @@ static ssize_t group_fwd_mask_store(stru } static DEVICE_ATTR_RW(group_fwd_mask); - + +static ssize_t disable_eap_hack_show(struct device *d, + struct device_attribute *attr, + char *buf) diff --git a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch index 5e7884130a..a78bb0f8a4 100644 --- a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig -@@ -408,6 +408,7 @@ config INET_XFRM_MODE_BEET +@@ -409,6 +409,7 @@ config INET_XFRM_MODE_BEET config INET_DIAG tristate "INET: socket monitoring interface" diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index cb13f0ff02..5847f956b1 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -2727,6 +2727,8 @@ static const struct file_operations proc +@@ -2730,6 +2730,8 @@ static const struct file_operations proc static int __init proc_vmalloc_init(void) { diff --git a/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 0f6ce1f802..794280eec9 100644 --- a/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -5924,7 +5924,7 @@ static void __ref alloc_node_mem_map(str +@@ -5923,7 +5923,7 @@ static void __ref alloc_node_mem_map(str mem_map = NODE_DATA(0)->node_mem_map; #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) if (page_to_pfn(mem_map) != pgdat->node_start_pfn)