Re: [LEDE-DEV] [PATCH] kernel: update kernel 4.14 to 4.14.32
Tested-by: Koen Vandeputte Targets: cns3xxx, imx6 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] kernel: update kernel 4.14 to 4.14.32
Op ma, 2 apr 2018 om 4:42 , schreef Hauke Mehrtens : The following patches are now included upstream: * 0052-MIPS-lantiq-fix-usb-clocks.patch * 0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch * 0060-lantiq-ase-enable-MFD-SYSCON.patch Closes: FS#1466 Compile-tested on: ramips/mt7621, x86/64 Run-tested on: ramips/mt7621 Signed-off-by: Hauke Mehrtens Tested-by: Stijn Segers --- include/kernel-version.mk | 4 +-- .../generic/hack-4.14/207-disable-modorder.patch | 4 +-- .../hack-4.14/702-phy_add_aneg_done_function.patch | 2 +- ...c_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++--- .../generic/pending-4.14/701-phy_extension.patch | 2 +- ...-add-detach-callback-to-struct-phy_driver.patch | 2 +- .../generic/pending-4.14/834-ledtrig-libata.patch | 8 ++--- .../0001-MIPS-lantiq-add-pcie-driver.patch | 4 +-- .../0052-MIPS-lantiq-fix-usb-clocks.patch | 25 --- .../0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch | 37 -- .../0060-lantiq-ase-enable-MFD-SYSCON.patch| 24 -- .../0048-net-core-add-RPS-balancer.patch | 6 ++-- .../patches-4.14/0052-net-phy-add-FC.patch | 2 +- .../patches-4.14/411-sfp-add-sfp-compatible.patch | 2 +- .../mvebu/patches-4.14/450-reprobe_sfp_phy.patch | 16 -- .../patches-4.14/0034-NET-multi-phy-support.patch | 6 ++-- 17 files changed, 33 insertions(+), 123 deletions(-) delete mode 100644 target/linux/lantiq/patches-4.14/0052-MIPS-lantiq-fix-usb-clocks.patch delete mode 100644 target/linux/lantiq/patches-4.14/0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch delete mode 100644 target/linux/lantiq/patches-4.14/0060-lantiq-ase-enable-MFD-SYSCON.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 43f891c1c9..4be674ccdd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,12 +5,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 LINUX_VERSION-4.4 = .121 LINUX_VERSION-4.9 = .91 -LINUX_VERSION-4.14 = .29 +LINUX_VERSION-4.14 = .32 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729 LINUX_KERNEL_HASH-4.9.91 = 60caa752ec9fa1c426f6a2f37db3f268d0961b67a723b6443949112167b39832 -LINUX_KERNEL_HASH-4.14.29 = 18f67b70ce9922c7ef95791bfd91f46e52ee9eb3e310978bb6ef6d2e93c14619 +LINUX_KERNEL_HASH-4.14.32 = cb0979bec663089a43b10cfbeae0cf9673544b0ff5968c33ede614ec0f43b680 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))) diff --git a/target/linux/generic/hack-4.14/207-disable-modorder.patch b/target/linux/generic/hack-4.14/207-disable-modorder.patch index 8f817f32a7..8f99cde617 100644 --- a/target/linux/generic/hack-4.14/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.14/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -1224,7 +1224,6 @@ all: modules +@@ -1233,7 +1233,6 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1253,7 +1252,6 @@ _modinst_: +@@ -1262,7 +1261,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch index 61e460fda7..0453112a1f 100644 --- a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1451,6 +1451,9 @@ int genphy_update_link(struct phy_device +@@ -1458,6 +1458,9 @@ int genphy_update_link(struct phy_device { int status; diff --git a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 43a1483c56..5ee89be5ad 100644 --- a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-4.14/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 -@@ -6156,7 +6156,7 @@ static void __ref alloc_node_mem_map(str +@@ -6147,7 +6147,7 @@ static void __ref alloc_node_mem_map(str mem_map = NODE_DATA(0)->node_mem_map; #if
[LEDE-DEV] [PATCH] kernel: update kernel 4.14 to 4.14.32
The following patches are now included upstream: * 0052-MIPS-lantiq-fix-usb-clocks.patch * 0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch * 0060-lantiq-ase-enable-MFD-SYSCON.patch Closes: FS#1466 Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 +-- .../generic/hack-4.14/207-disable-modorder.patch | 4 +-- .../hack-4.14/702-phy_add_aneg_done_function.patch | 2 +- ...c_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++--- .../generic/pending-4.14/701-phy_extension.patch | 2 +- ...-add-detach-callback-to-struct-phy_driver.patch | 2 +- .../generic/pending-4.14/834-ledtrig-libata.patch | 8 ++--- .../0001-MIPS-lantiq-add-pcie-driver.patch | 4 +-- .../0052-MIPS-lantiq-fix-usb-clocks.patch | 25 --- .../0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch | 37 -- .../0060-lantiq-ase-enable-MFD-SYSCON.patch| 24 -- .../0048-net-core-add-RPS-balancer.patch | 6 ++-- .../patches-4.14/0052-net-phy-add-FC.patch | 2 +- .../patches-4.14/411-sfp-add-sfp-compatible.patch | 2 +- .../mvebu/patches-4.14/450-reprobe_sfp_phy.patch | 16 -- .../patches-4.14/0034-NET-multi-phy-support.patch | 6 ++-- 17 files changed, 33 insertions(+), 123 deletions(-) delete mode 100644 target/linux/lantiq/patches-4.14/0052-MIPS-lantiq-fix-usb-clocks.patch delete mode 100644 target/linux/lantiq/patches-4.14/0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch delete mode 100644 target/linux/lantiq/patches-4.14/0060-lantiq-ase-enable-MFD-SYSCON.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 43f891c1c9..4be674ccdd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,12 +5,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 LINUX_VERSION-4.4 = .121 LINUX_VERSION-4.9 = .91 -LINUX_VERSION-4.14 = .29 +LINUX_VERSION-4.14 = .32 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729 LINUX_KERNEL_HASH-4.9.91 = 60caa752ec9fa1c426f6a2f37db3f268d0961b67a723b6443949112167b39832 -LINUX_KERNEL_HASH-4.14.29 = 18f67b70ce9922c7ef95791bfd91f46e52ee9eb3e310978bb6ef6d2e93c14619 +LINUX_KERNEL_HASH-4.14.32 = cb0979bec663089a43b10cfbeae0cf9673544b0ff5968c33ede614ec0f43b680 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))) diff --git a/target/linux/generic/hack-4.14/207-disable-modorder.patch b/target/linux/generic/hack-4.14/207-disable-modorder.patch index 8f817f32a7..8f99cde617 100644 --- a/target/linux/generic/hack-4.14/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.14/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -1224,7 +1224,6 @@ all: modules +@@ -1233,7 +1233,6 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1253,7 +1252,6 @@ _modinst_: +@@ -1262,7 +1261,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch index 61e460fda7..0453112a1f 100644 --- a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1451,6 +1451,9 @@ int genphy_update_link(struct phy_device +@@ -1458,6 +1458,9 @@ int genphy_update_link(struct phy_device { int status; diff --git a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 43a1483c56..5ee89be5ad 100644 --- a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-4.14/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 -@@ -6156,7 +6156,7 @@ static void __ref alloc_node_mem_map(str +@@ -6147,7 +6147,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) diff --git a/target/linux/g