aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-19 08:04:26 -0800
committerDavid Bauer <mail@david-bauer.net>2021-02-26 20:41:01 +0100
commit3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d (patch)
tree725dcb6f20bb3999d184eeb27afec8373b8d9e5e /target/linux/generic/pending-5.4
parent3888fa78802354ab7bbd19b7d061fd80a16ce06b (diff)
downloadupstream-3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d.tar.gz
upstream-3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d.tar.bz2
upstream-3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d.zip
kernel: 5.4: fix patches after wireguard backport
No major problems, just a minor Kconfig fix and a refresh. Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.4')
-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 f497688556..052db7ef5c 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
@@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
-@@ -150,6 +160,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
+@@ -149,6 +159,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/