Jakub Kicinski e5abd12f3d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c f7ce5eb2cb79 ("bnxt_en: Fix crash in bnxt_get_max_rss_ctx_ring()") 20c8ad72eb7f ("eth: bnxt: use the RSS context XArray instead of the local list") Adjacent changes: net/ethtool/ioctl.c 503757c80928 ("net: ethtool: Fix RSS setting") eac9122f0c41 ("net: ethtool: record custom RSS contexts in the XArray") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-07-12 22:20:30 -07:00
..
events	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-07-12 22:20:30 -07:00
misc	NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP'	2024-05-06 12:47:24 -04:00
stages	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
bpf_probe.h	bpf: pass whole link instead of prog when triggering raw tracepoint	2024-03-19 23:05:33 -07:00
define_custom_trace.h
define_trace.h
perf.h	perf/tracing: Use stage6 of tracing to not duplicate macros	2023-01-25 10:31:24 -05:00
syscall.h
trace_custom_events.h
trace_events.h