Hi,
The following batch contains Netfilter updates for net-next:
1) Replace msecs_to_jiffies() by secs_to_jiffies(), from Easwar Hariharan.
2) Allow to compile xt_cgroup with cgroupsv2 support only,
from Michal Koutny.
3) Prepare for sock_cgroup_classid() removal by wrapping it around
ifdef, also from Michal Koutny.
4) Remove redundant pointer fetch on conntrack template, from Xuanqiang Luo.
5) Re-format one block in the tproxy documentation for consistency,
from Chen Linxuan.
6) Expose set element count and type via netlink attributes,
from Florian Westphal.
I have put to sleep the patch "Disable xtables legacy with PREEMPT_RT"
as suggested by Jakub Kicinski.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git nf-next-25-04-29
Thanks.
----------------------------------------------------------------
The following changes since commit bef4f1156b74721b7d111114538659031119b6f2:
net: phy: marvell-88q2xxx: Enable temperature sensor for mv88q211x (2025-04-24 13:19:51 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-25-04-29
for you to fetch changes up to 0014af802193aa3547484b5db0f1a258bad28c81:
netfilter: nf_tables: export set count and backend name to userspace (2025-04-29 00:00:27 +0200)
----------------------------------------------------------------
netfilter pull request 25-04-29
----------------------------------------------------------------
Chen Linxuan (1):
docs: tproxy: fix formatting for nft code block
Easwar Hariharan (1):
netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies()
Florian Westphal (1):
netfilter: nf_tables: export set count and backend name to userspace
Michal Koutný (2):
netfilter: xt_cgroup: Make it independent from net_cls
net: cgroup: Guard users of sock_cgroup_classid()
Xuanqiang Luo (1):
netfilter: conntrack: Remove redundant NFCT_ALIGN call
Documentation/networking/tproxy.rst | 4 ++--
include/uapi/linux/netfilter/nf_tables.h | 4 ++++
net/ipv4/inet_diag.c | 2 +-
net/netfilter/Kconfig | 2 +-
net/netfilter/nf_conntrack_core.c | 4 +---
net/netfilter/nf_tables_api.c | 26 ++++++++++++++++++++++++++
net/netfilter/xt_IDLETIMER.c | 12 ++++++------
net/netfilter/xt_cgroup.c | 26 ++++++++++++++++++++++++++
8 files changed, 67 insertions(+), 13 deletions(-)
