From ff889898d29603878f82b53eb9860e54ed0ebb43 Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 6 Jun 2022 07:05:18 -0400 Subject: kernel: bump 5.10 to 5.10.120 All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800, x86/64 Signed-off-by: John Audia (cherry picked from commit f800f8d6fc4f21ed87454aa657ebbf376dc3b6cf) --- ...5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | 4 ++-- target/linux/generic/hack-5.10/251-kconfig.patch | 2 +- target/linux/generic/hack-5.10/253-ksmbd-config.patch | 2 +- target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch | 2 +- target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch index fa6e0c4173..55c04ba4fd 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso nft_trans_table_update(trans) = true; list_add_tail(&trans->list, &ctx->net->nft.commit_list); return 0; -@@ -7908,11 +7912,10 @@ static int nf_tables_commit(struct net * +@@ -7918,11 +7922,10 @@ static int nf_tables_commit(struct net * switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso } else { nft_clear(net, trans->ctx.table); } -@@ -8125,11 +8128,9 @@ static int __nf_tables_abort(struct net +@@ -8135,11 +8138,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { diff --git a/target/linux/generic/hack-5.10/251-kconfig.patch b/target/linux/generic/hack-5.10/251-kconfig.patch index 34a63eaa7c..4ada399fbf 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 -@@ -418,16 +418,16 @@ config BCH_CONST_T +@@ -420,16 +420,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 c2b2a96b9c..adce3f5f15 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 -@@ -589,7 +589,7 @@ config LIBFDT +@@ -591,7 +591,7 @@ config LIBFDT bool config OID_REGISTRY diff --git a/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch b/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch index dfba811f31..4ffd8cfa37 100644 --- a/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch +++ b/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch @@ -4,7 +4,7 @@ from backports. --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig -@@ -4,7 +4,7 @@ config CRYPTO_LIB_AES +@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES tristate config CRYPTO_LIB_ARC4 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 20483a391d..d30d3b7560 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 -@@ -315,6 +315,12 @@ config ZSTD_DECOMPRESS +@@ -317,6 +317,12 @@ config ZSTD_DECOMPRESS source "lib/xz/Kconfig" -- cgit v1.2.3