mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-10-26 10:57:38 +08:00
Merge in late fixes in preparation for the net-next PR. Conflicts: net/netfilter/nf_conntrack_netlink.ccd37ab22a7("netfilter: nf_conntrack_netlink: fix inverted IPv6 tuple filter")1ae2d094b0("netfilter: ctnetlink: fix inverted IPv6 address match in dump filter") Adjacent changes: drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c8830e65ed4("net: use assign_bit() where applicable")07bd391eb9("octeontx2-af: Fix CQ enable state tracking after AQ writes") net/core/sock.c31c5ea8a32("ipv6: Remove IPV6_ADDRFORM.")31b564f70d("net: use the full socket in sk_mc_loop()") net/mptcp/protocol.h0cb6910130("mptcp: remove thmac from subflow ctx")7538fa33bb("mptcp: fix subflow bitfield misuse") Signed-off-by: Paolo Abeni <pabeni@redhat.com>