diff options
author | John Audia <therealgraysky@proton.me> | 2022-06-06 07:05:18 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-07 22:28:59 +0200 |
commit | ff889898d29603878f82b53eb9860e54ed0ebb43 (patch) | |
tree | 6ff89f0a07dc9d3115505751b00741b58eb5f82a /target/linux/generic/backport-5.10 | |
parent | 0ca93670693bc63045b181505d9ff69c4bde5750 (diff) | |
download | upstream-ff889898d29603878f82b53eb9860e54ed0ebb43.tar.gz upstream-ff889898d29603878f82b53eb9860e54ed0ebb43.tar.bz2 upstream-ff889898d29603878f82b53eb9860e54ed0ebb43.zip |
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 <therealgraysky@proton.me>
(cherry picked from commit f800f8d6fc4f21ed87454aa657ebbf376dc3b6cf)
Diffstat (limited to 'target/linux/generic/backport-5.10')
-rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 <pablo@netfilter.org> 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 <pablo@netfilter.org> } 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)) { |