Jakub Kicinski a6ec08beec 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 1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error") 165f87691a89 ("bnxt_en: add timestamping statistics support") No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-06-20 13:49:59 -07:00
..
events	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-06-20 13:49:59 -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
syscall.h
trace_custom_events.h
trace_events.h