Jakub Kicinski 7c8267275d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/act_ct.c
  26488172b029 ("net/sched: Fix UAF when resolving a clash")
  3abbd7ed8b76 ("act_ct: prepare for stolen verdict coming from conntrack and nat engine")

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-07-11 12:58:13 -07:00

..

events

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-07-11 12:58:13 -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

tracing: Add TRACE_CUSTOM_EVENT() macro

2022-03-11 11:49:24 -05:00

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

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: Rename the staging files for trace_events

2022-04-02 08:40:04 -04:00