Hi Greg, Sasha,
The following list shows the backported patches, I am using original commit IDs for reference:
1) 1e9451cbda45 ("netfilter: nf_tables: fix nat hook table deletion")
2) 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks")
3) 802b805162a1 ("netfilter: nftables: add helper function to set the base sequence number")
4) 19c28b1374fb ("netfilter: add helper function to set up the nfnetlink header and use it")
5) 0854db2aaef3 ("netfilter: nf_tables: use net_generic infra for transaction data")
6) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE")
7) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain")
8) 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase")
9) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails")
10) 2024439bd5ce ("netfilter: nf_tables: fix scheduling-while-atomic splat")
Please, apply, Thanks.
Florian Westphal (3): netfilter: nf_tables: fix nat hook table deletion netfilter: nf_tables: add rescheduling points during loop detection walks netfilter: nf_tables: fix scheduling-while-atomic splat
Pablo Neira Ayuso (7): netfilter: nftables: add helper function to set the base sequence number netfilter: add helper function to set up the nfnetlink header and use it netfilter: nf_tables: use net_generic infra for transaction data netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain netfilter: nf_tables: reject unbound anonymous set before commit phase netfilter: nf_tables: unbind non-anonymous set if rule construction fails
include/linux/netfilter/nfnetlink.h | 27 ++ include/net/netfilter/nf_tables.h | 14 + include/net/netns/nftables.h | 5 - net/netfilter/ipset/ip_set_core.c | 17 +- net/netfilter/nf_conntrack_netlink.c | 77 ++--- net/netfilter/nf_tables_api.c | 483 ++++++++++++++++----------- net/netfilter/nf_tables_trace.c | 9 +- net/netfilter/nfnetlink_acct.c | 11 +- net/netfilter/nfnetlink_cthelper.c | 11 +- net/netfilter/nfnetlink_cttimeout.c | 22 +- net/netfilter/nfnetlink_log.c | 11 +- net/netfilter/nfnetlink_queue.c | 12 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_compat.c | 11 +- net/netfilter/nft_dynset.c | 6 +- 15 files changed, 383 insertions(+), 344 deletions(-)