From c672ca8ab39cc9f09032259728bf375cb53d24a9 Mon Sep 17 00:00:00 2001 From: JoseCoW <88561480+JoseCoW@users.noreply.github.com> Date: Mon, 21 Mar 2022 11:16:37 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.186 (#9107) Signed-off-by: JoseCoW <88561480+JoseCoW@users.noreply.github.com> --- include/kernel-5.4 | 4 ++-- target/linux/generic/hack-5.4/251-sound_kconfig.patch | 2 +- .../linux/generic/hack-5.4/301-mips_image_cmdline_hack.patch | 2 +- .../generic/pending-5.4/530-jffs2_make_lzma_available.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 8c2bf3c5a..27cef8361 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .185 -LINUX_KERNEL_HASH-5.4.185 = d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787 +LINUX_VERSION-5.4 = .186 +LINUX_KERNEL_HASH-5.4.186 = 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 diff --git a/target/linux/generic/hack-5.4/251-sound_kconfig.patch b/target/linux/generic/hack-5.4/251-sound_kconfig.patch index f593417c9..e0ab4ee00 100644 --- a/target/linux/generic/hack-5.4/251-sound_kconfig.patch +++ b/target/linux/generic/hack-5.4/251-sound_kconfig.patch @@ -92,7 +92,7 @@ Signed-off-by: John Crispin bool --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -402,16 +402,16 @@ config BCH_CONST_T +@@ -401,16 +401,16 @@ config BCH_CONST_T # Textsearch support is select'ed if needed # config TEXTSEARCH diff --git a/target/linux/generic/hack-5.4/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-5.4/301-mips_image_cmdline_hack.patch index ddae75f61..eab6349e5 100644 --- a/target/linux/generic/hack-5.4/301-mips_image_cmdline_hack.patch +++ b/target/linux/generic/hack-5.4/301-mips_image_cmdline_hack.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1164,6 +1164,10 @@ config SYNC_R4K +@@ -1162,6 +1162,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch index 052db7ef5..4d47e0368 100644 --- a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.4/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 -@@ -303,6 +303,12 @@ config ZSTD_DECOMPRESS +@@ -302,6 +302,12 @@ config ZSTD_DECOMPRESS source "lib/xz/Kconfig"