From 1eb5d50fd3dff15a2e316fcfa3c25597be429526 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 19 Mar 2022 12:16:47 -0400 Subject: [PATCH] kernel: bump 5.10 to 5.10.107 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- include/kernel-5.10 | 4 ++-- target/linux/generic/hack-5.10/251-kconfig.patch | 2 +- target/linux/generic/hack-5.10/253-ksmbd-config.patch | 2 +- .../pending-5.10/530-jffs2_make_lzma_available.patch | 2 +- .../107-powerpc-85xx-add-ws-ap3825i-support.patch | 7 ------- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index c1fb9ba55d0..aa61efeb7b5 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .106 -LINUX_KERNEL_HASH-5.10.106 = c68651c8c70e2443ab6ebd1a3ed4e06694f988ffa40a664d8374f0cee0a3597a +LINUX_VERSION-5.10 = .107 +LINUX_KERNEL_HASH-5.10.107 = c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea diff --git a/target/linux/generic/hack-5.10/251-kconfig.patch b/target/linux/generic/hack-5.10/251-kconfig.patch index f80561c8e6b..34a63eaa7c4 100644 --- a/target/linux/generic/hack-5.10/251-kconfig.patch +++ b/target/linux/generic/hack-5.10/251-kconfig.patch @@ -92,7 +92,7 @@ Signed-off-by: John Crispin bool --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -419,16 +419,16 @@ config BCH_CONST_T +@@ -418,16 +418,16 @@ config BCH_CONST_T # Textsearch support is select'ed if needed # config TEXTSEARCH diff --git a/target/linux/generic/hack-5.10/253-ksmbd-config.patch b/target/linux/generic/hack-5.10/253-ksmbd-config.patch index be6ed72d3a3..c2b2a96b9cc 100644 --- a/target/linux/generic/hack-5.10/253-ksmbd-config.patch +++ b/target/linux/generic/hack-5.10/253-ksmbd-config.patch @@ -11,7 +11,7 @@ that can be interpreted by the ASN.1 stream decoder and used to --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -590,7 +590,7 @@ config LIBFDT +@@ -589,7 +589,7 @@ config LIBFDT bool config OID_REGISTRY diff --git a/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch index c794c6fe8f7..20483a391dd 100644 --- a/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch @@ -1087,7 +1087,7 @@ Signed-off-by: Alexandros C. Couloumbis #define JFFS2_NODE_ACCURATE 0x2000 --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -316,6 +316,12 @@ config ZSTD_DECOMPRESS +@@ -315,6 +315,12 @@ config ZSTD_DECOMPRESS source "lib/xz/Kconfig" diff --git a/target/linux/mpc85xx/patches-5.10/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-5.10/107-powerpc-85xx-add-ws-ap3825i-support.patch index 881f88ddb5a..1829a78ec47 100644 --- a/target/linux/mpc85xx/patches-5.10/107-powerpc-85xx-add-ws-ap3825i-support.patch +++ b/target/linux/mpc85xx/patches-5.10/107-powerpc-85xx-add-ws-ap3825i-support.patch @@ -6,8 +6,6 @@ Subject: [PATCH] PowerPC 85xx: Add WS-AP3825i support This patch adds support for building Linux for the Extreme Networks WS-AP3825i AP. -diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig -index 764b916..66cbb73 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -82,6 +82,16 @@ config WS_AP3710I @@ -27,8 +25,6 @@ index 764b916..66cbb73 100644 config MPC8540_ADS bool "Freescale MPC8540 ADS" select DEFAULT_UIMAGE -diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile -index 443b44b..d37b650 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_P1023_RDB) += p1023_rdb.o @@ -39,6 +35,3 @@ index 443b44b..d37b650 100644 obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o obj-$(CONFIG_FB_FSL_DIU) += t1042rdb_diu.o obj-$(CONFIG_RED_15W_REV1) += red15w_rev1.o --- -2.25.1 - -- 2.30.2