Jakub Kicinski 2ee738e90e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR (net-6.13-rc8). Conflicts: drivers/net/ethernet/realtek/r8169_main.c 1f691a1fc4 ("r8169: remove redundant hwmon support") 152d00a913 ("r8169: simplify setting hwmon attribute visibility") https://lore.kernel.org/20250115122152.760b4e8d@canb.auug.org.au Adjacent changes: drivers/net/ethernet/broadcom/bnxt/bnxt.c 152f4da05a ("bnxt_en: add support for rx-copybreak ethtool command") f0aa6a37a3 ("eth: bnxt: always recalculate features after XDP clearing, fix null-deref") drivers/net/ethernet/intel/ice/ice_type.h 50327223a8 ("ice: add lock to protect low latency interface") dc26548d72 ("ice: Fix quad registers read on E825") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2025-01-16 10:34:59 -08:00
..
events	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2025-01-16 10:34:59 -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
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