aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-09-15 09:56:36 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-09-17 15:58:25 +0200
commitbe4abbd84ab7e1492ded6e37aab34936c6fe9a23 (patch)
tree306961412044e31dd8313372fdf01cea05dd3068 /target/linux/generic
parent4e05e7dddf9c0665135a743cfa32cbc8abc9e3aa (diff)
downloadupstream-be4abbd84ab7e1492ded6e37aab34936c6fe9a23.tar.gz
upstream-be4abbd84ab7e1492ded6e37aab34936c6fe9a23.tar.bz2
upstream-be4abbd84ab7e1492ded6e37aab34936c6fe9a23.zip
kernel: bump 5.10 to 5.10.143
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit b77217d916ba48accbdb46589e6e5e3a9972c44e)
Diffstat (limited to 'target/linux/generic')
-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 f9bb0e2cc3..352c6094da 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;
-@@ -7919,11 +7923,10 @@ static int nf_tables_commit(struct net *
+@@ -7921,11 +7925,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);
}
-@@ -8137,11 +8140,9 @@ static int __nf_tables_abort(struct net
+@@ -8139,11 +8142,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {