aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-04-06 00:46:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-07 20:42:34 +0200
commit39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3 (patch)
tree1af94a9d02252f72613b12dcbdeebd6cb6ffc04d /target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch
parent3008f1f441a41e162311cee1ccadfdaaec1581c1 (diff)
downloadupstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.tar.gz
upstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.tar.bz2
upstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.zip
kernel: bump 5.4 to 5.4.188
Added the new configuration options: CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y Manually adapted: target/linux/generic/hack-5.4/220-gc_sections.patch Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch')
-rw-r--r--target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch2
1 files changed, 1 insertions, 1 deletions
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 052db7ef5c..4d47e03681 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 <alex@ozo.com>
#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"