Jakub Kicinski 357660d759 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR (net-6.14-rc5). Conflicts: drivers/net/ethernet/cadence/macb_main.c fa52f15c74 ("net: cadence: macb: Synchronize stats calculations") 75696dd0fd ("net: cadence: macb: Convert to get_stats64") https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au Adjacent changes: drivers/net/ethernet/intel/ice/ice_sriov.c 79990cf5e7 ("ice: Fix deinitializing VF in error path") a203163274 ("ice: simplify VF MSI-X managing") net/ipv4/tcp.c 18912c5206 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace") 297d389e9e ("net: prefix devmem specific helpers") net/mptcp/subflow.c 8668860b0a ("mptcp: reset when MPTCP opts are dropped after join") c3349a22c2 ("mptcp: consolidate subflow cleanup") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2025-02-27 10:20:58 -08:00
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2025-02-27 10:20:58 -08:00
diag.c	af_unix: Remove U_LOCK_DIAG.	2024-06-25 11:10:18 +02:00
garbage.c	af_unix: Set drop reason in __unix_gc().	2025-01-20 11:27:41 -08:00
Kconfig	af_unix: Add a prompt to CONFIG_AF_UNIX_OOB	2024-12-19 19:16:15 -08:00
Makefile	af_unix: Remove CONFIG_UNIX_SCM.	2024-01-31 16:41:16 -08:00
sysctl_net_unix.c	net: Remove the now superfluous sentinel elements from ctl_table array	2024-05-03 13:29:41 +01:00
unix_bpf.c	af_unix: Disable MSG_OOB handling for sockets in sockmap/sockhash	2024-07-17 22:49:00 +02:00