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
..
events	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2025-02-27 10:20:58 -08:00
misc	NFS: trace: show TIMEDOUT instead of 0x6e	2024-09-01 10:04:55 -04:00
stages	tracing: Add __print_dynamic_array() helper	2024-10-30 17:24:32 +01:00
bpf_probe.h	tracing/bpf: Add might_fault check to syscall probes	2024-10-09 17:09:46 -04:00
define_custom_trace.h	tracing: Add TRACE_CUSTOM_EVENT() macro	2022-03-11 11:49:24 -05:00
define_trace.h	Add Rust support for trace events:	2024-11-25 15:44:29 -08:00
perf.h	tracing/perf: Add might_fault check to syscall probes	2024-10-09 17:09:46 -04:00
syscall.h	tracepoints: Migrate to use SYSCALL_WORK flag	2020-11-16 21:53:15 +01:00
trace_custom_events.h	tracing: Rename the staging files for trace_events	2022-04-02 08:40:04 -04:00
trace_events.h	tracing/ftrace: Add might_fault check to syscall probes	2024-10-09 17:09:36 -04:00