diff options
| author | John Audia <therealgraysky@proton.me> | 2022-07-12 11:51:28 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-18 23:14:30 +0200 |
| commit | c600d1cb009d228afe1e1b65040109ebb3dcb7f4 (patch) | |
| tree | a2a4b47fe76137ed782f37c26c279069272efb0d /target/linux/generic/backport-5.10 | |
| parent | 06c9e8bfdfae39bbb8a4d47ddaf7ec9fc39868d0 (diff) | |
| download | upstream-c600d1cb009d228afe1e1b65040109ebb3dcb7f4.tar.gz upstream-c600d1cb009d228afe1e1b65040109ebb3dcb7f4.tar.bz2 upstream-c600d1cb009d228afe1e1b65040109ebb3dcb7f4.zip | |
kernel: bump 5.10 to 5.10.130
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
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 e32bcfa4a7..d2076031ca 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; -@@ -7916,11 +7920,10 @@ static int nf_tables_commit(struct net * +@@ -7923,11 +7927,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); } -@@ -8133,11 +8136,9 @@ static int __nf_tables_abort(struct net +@@ -8140,11 +8143,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { |