From f529c8463f82266538b19e9ad888ee9d6de412c1 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 30 Jun 2021 16:57:44 -0400 Subject: [PATCH] kernel: bump 5.4 to 5.4.129 All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia --- include/kernel-version.mk | 4 ++-- .../950-0297-arch-arm-Add-model-string-to-cpuinfo.patch | 4 ++-- target/linux/generic/hack-5.4/204-module_strip.patch | 6 +++--- .../generic/pending-5.4/203-kallsyms_uncompressed.patch | 2 +- .../linux/generic/pending-5.4/630-packet_socket_type.patch | 4 ++-- target/linux/generic/pending-5.4/920-mangle_bootargs.patch | 2 +- ...K-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch | 2 +- ...-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index daa1a5efa8..b0611454b1 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-5.4 = .128 +LINUX_VERSION-5.4 = .129 LINUX_VERSION-5.10 = .46 -LINUX_KERNEL_HASH-5.4.128 = 3b54aebb816b9e628cb9ba3055a6aca58ce0ddeec49366c0da86ced9a7be39ab +LINUX_KERNEL_HASH-5.4.129 = 4426462413d174909a1d9938ce420b8b3cb219140d164270ccabd282fa2346df LINUX_KERNEL_HASH-5.10.46 = 569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch index 4e9598a54e..e3cf7bb9e1 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c -@@ -1249,6 +1249,8 @@ static int c_show(struct seq_file *m, vo +@@ -1251,6 +1251,8 @@ static int c_show(struct seq_file *m, vo { int i, j; u32 cpuid; @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell for_each_online_cpu(i) { /* -@@ -1308,6 +1310,14 @@ static int c_show(struct seq_file *m, vo +@@ -1310,6 +1312,14 @@ static int c_show(struct seq_file *m, vo seq_printf(m, "Revision\t: %04x\n", system_rev); seq_printf(m, "Serial\t\t: %s\n", system_serial); diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch index 22bb1ac33a..c6420739c0 100644 --- a/target/linux/generic/hack-5.4/204-module_strip.patch +++ b/target/linux/generic/hack-5.4/204-module_strip.patch @@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -2195,6 +2195,13 @@ config TRIM_UNUSED_KSYMS +@@ -2198,6 +2198,13 @@ config TRIM_UNUSED_KSYMS If unsure, or if you need to build out-of-tree modules, say N. @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3252,9 +3252,11 @@ static int setup_load_info(struct load_i +@@ -3256,9 +3256,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3275,6 +3277,7 @@ static int check_modinfo(struct module * +@@ -3279,6 +3281,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch index c4c13b9695..68a2d4d88f 100644 --- a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -1277,6 +1277,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1280,6 +1280,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference diff --git a/target/linux/generic/pending-5.4/630-packet_socket_type.patch b/target/linux/generic/pending-5.4/630-packet_socket_type.patch index a137fb5a6d..d9bfda1303 100644 --- a/target/linux/generic/pending-5.4/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.4/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3922,6 +3925,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3924,6 +3927,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3978,6 +3991,13 @@ static int packet_getsockopt(struct sock +@@ -3980,6 +3993,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch index 7523b396ba..83db92609b 100644 --- a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1662,6 +1662,15 @@ config EMBEDDED +@@ -1665,6 +1665,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration. diff --git a/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch b/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch index 07fac213ce..02562b7587 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch @@ -35,7 +35,7 @@ Signed-off-by: Han Xu struct nxp_fspi { void __iomem *iobase; void __iomem *ahb_addr; -@@ -1083,6 +1099,8 @@ static int nxp_fspi_resume(struct device +@@ -1082,6 +1098,8 @@ static int nxp_fspi_resume(struct device static const struct of_device_id nxp_fspi_dt_ids[] = { { .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, }, diff --git a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch index a8db23cebb..534c014a2b 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch @@ -76,7 +76,7 @@ Signed-off-by: Han Xu } else { if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT) nxp_fspi_fill_txfifo(f, op); -@@ -999,9 +1025,8 @@ static int nxp_fspi_probe(struct platfor +@@ -993,9 +1019,8 @@ static int nxp_fspi_probe(struct platfor /* find the resources - controller memory mapped space */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap"); @@ -88,7 +88,7 @@ Signed-off-by: Han Xu goto err_put_ctrl; } -@@ -1080,6 +1105,9 @@ static int nxp_fspi_remove(struct platfo +@@ -1079,6 +1104,9 @@ static int nxp_fspi_remove(struct platfo mutex_destroy(&f->lock); -- 2.30.2