207dd12bc195153fe6ca614d8add9ecb0b636270 - pub/scm/linux/kernel/git/netdev/net

commit: 207dd12bc195153fe6ca614d8add9ecb0b636270

[log]
author: Paolo Abeni <pabeni@redhat.com>

Thu Oct 22 11:41:47 2026 +0200
committer: Paolo Abeni <pabeni@redhat.com>

Thu Oct 22 11:45:58 2026 +0200
tree: dbaa855c271985e94a813cea919eb9396c99da84
parent: f71ff7d406523748bfb8236830c7eaa6a308aaa1 [diff]
parent: f4377bf85887f57b59abb5479f7660a81ffe4449 [diff]

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Merge in late fixes in preparation for the net-next PR.

Conflicts:

net/netfilter/nf_conntrack_netlink.c
  cd37ab22a74e0 ("netfilter: nf_conntrack_netlink: fix inverted IPv6 tuple filter")
  1ae2d094b0200 ("netfilter: ctnetlink: fix inverted IPv6 address match in dump filter")

Adjacent changes:

drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
  8830e65ed46de ("net: use assign_bit() where applicable")
  07bd391eb957 ("octeontx2-af: Fix CQ enable state tracking after AQ writes")

net/core/sock.c
  31c5ea8a3296 ("ipv6: Remove IPV6_ADDRFORM.")
  31b564f70d88 ("net: use the full socket in sk_mc_loop()")

net/mptcp/protocol.h
  0cb6910130a3 ("mptcp: remove thmac from subflow ctx")
  7538fa33bb2f ("mptcp: fix subflow bitfield misuse")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

tree: dbaa855c271985e94a813cea919eb9396c99da84