diff options
author | John Audia <therealgraysky@proton.me> | 2022-06-29 04:22:49 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-29 23:38:47 +0200 |
commit | 433dc5892a60003753655aac6e6a4b59fb13b2e4 (patch) | |
tree | caeda1fea9abfba97248e0e8d77da342a2b7b49f /target/linux/generic/backport-5.10 | |
parent | c5882c33a78153e84acca22af3429ff6eb6c99e0 (diff) | |
download | upstream-433dc5892a60003753655aac6e6a4b59fb13b2e4.tar.gz upstream-433dc5892a60003753655aac6e6a4b59fb13b2e4.tar.bz2 upstream-433dc5892a60003753655aac6e6a4b59fb13b2e4.zip |
kernel: bump 5.10 to 5.10.127
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
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 9a42cb12d3..e32bcfa4a7 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; -@@ -7910,11 +7914,10 @@ static int nf_tables_commit(struct net * +@@ -7916,11 +7920,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); } -@@ -8127,11 +8130,9 @@ static int __nf_tables_abort(struct net +@@ -8133,11 +8136,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { |