aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-08-11 20:16:43 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2023-08-11 23:17:31 +0200
commit419218af13b4c036b3f27e450855727005b8d141 (patch)
tree9462bc8f5f482327731f969aef82b8aa36d70421 /target/linux/generic/backport-5.10
parent59dce3b595b0477bef991f6504d28fbd89cc8b4d (diff)
downloadupstream-419218af13b4c036b3f27e450855727005b8d141.tar.gz
upstream-419218af13b4c036b3f27e450855727005b8d141.tar.bz2
upstream-419218af13b4c036b3f27e450855727005b8d141.zip
kernel: bump 5.10 to 5.10.190
All patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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.patch4
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 446380d6d0..b3f6066a32 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;
nft_trans_commit_list_add_tail(ctx->net, trans);
return 0;
-@@ -8183,11 +8187,10 @@ static int nf_tables_commit(struct net *
+@@ -8191,11 +8195,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);
}
-@@ -8406,11 +8409,9 @@ static int __nf_tables_abort(struct net
+@@ -8414,11 +8417,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {