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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/ip_gre.c
  17af420545 ("erspan: make sure erspan_base_hdr is present in skb->head")
  5832c4a77d ("ip_tunnel: convert __be16 tunnel flags to bitmaps")
https://lore.kernel.org/all/[email protected]/

Adjacent changes:

net/ipv6/ip6_fib.c
  d21d40605b ("ipv6: Fix infinite recursion in fib6_dump_done().")
  5fc68320c1 ("ipv6: remove RTNL protection from inet6_dump_fib()")

Signed-off-by: Jakub Kicinski <[email protected]>

2024-04-04 18:01:07 -07:00

..

rv

…

blktrace.c

…

bpf_trace.c

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

2024-04-04 18:01:07 -07:00

bpf_trace.h

…

error_report-traces.c

…

fgraph.c

…

fprobe.c

fprobe: Fix to allocate entry_data_size buffer with rethook instances

2024-03-01 09:18:24 +09:00

ftrace_internal.h

…

ftrace.c

ftrace: Fix most kernel-doc warnings

2024-03-18 10:33:05 -04:00

Kconfig

…

kprobe_event_gen_test.c

…

Makefile

…

pid_list.c

…

pid_list.h

…

power-traces.c

…

preemptirq_delay_test.c

…

rethook.c

rethook: Use __rcu pointer for rethook::handler

2023-12-01 14:53:56 +09:00

ring_buffer_benchmark.c

ring-buffer: Read and write to ring buffers with custom sub buffer size

2023-12-20 07:54:56 -05:00

ring_buffer.c

ring-buffer: Make wake once of ring_buffer_wait() more robust

2024-03-18 10:11:43 -04:00

rpm-traces.c

…

synth_event_gen_test.c

tracing / synthetic: Disable events after testing in synth_event_gen_test_init()

2023-12-21 10:04:45 -05:00

trace_benchmark.c

tracing: Use div64_u64() instead of do_div()

2024-03-18 10:33:06 -04:00

trace_benchmark.h

…

trace_boot.c

tracing: Allow creating instances with specified system events

2023-12-18 23:14:16 -05:00

trace_branch.c

…

trace_btf.c

tracing/probes: Fix to search structure fields correctly

2024-02-17 21:25:42 +09:00

trace_btf.h

…

trace_clock.c

…

trace_dynevent.c

…

trace_dynevent.h

…

trace_entries.h

…

trace_eprobe.c

tracing/probes: Support $argN in return probe (kprobe and fprobe)

2024-03-07 00:27:34 +09:00

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_hist.c

tracing histograms: Simplify parse_actions() function

2024-01-08 13:24:56 -05:00

trace_events_inject.c

…

trace_events_synth.c

tracing/synthetic: Fix trace_string() return value

2024-02-15 11:40:01 -05:00

trace_events_trigger.c

tracing: Decrement the snapshot if the snapshot trigger fails to register

2024-03-18 10:33:05 -04:00

trace_events_user.c

tracing/user_events: Introduce multi-format events

2024-03-18 10:13:03 -04:00

trace_events.c

ring-buffer: Page size per ring buffer

2023-12-20 07:54:55 -05:00

trace_export.c

…

trace_fprobe.c

tracing/probes: Support $argN in return probe (kprobe and fprobe)

2024-03-07 00:27:34 +09:00

trace_functions_graph.c

…

trace_functions.c

…

trace_hwlat.c

…

trace_irqsoff.c

…

trace_kdb.c

…

trace_kprobe_selftest.c

…

trace_kprobe_selftest.h

…

trace_kprobe.c

tracing/probes: Support $argN in return probe (kprobe and fprobe)

2024-03-07 00:27:34 +09:00

trace_mmiotrace.c

…

trace_nop.c

…

trace_osnoise.c

tracing/timerlat: Move hrtimer_init to timerlat_fd open()

2024-02-01 11:50:13 -05:00

trace_output.c

tracing: Remove precision vsnprintf() check from print event

2024-03-06 13:26:26 -05:00

trace_output.h

…

trace_preemptirq.c

…

trace_printk.c

…

trace_probe_kernel.h

…

trace_probe_tmpl.h

tracing/probes: Support $argN in return probe (kprobe and fprobe)

2024-03-07 00:27:34 +09:00

trace_probe.c

bitops: make BYTES_TO_BITS() treewide-available

2024-04-01 10:49:27 +01:00

trace_probe.h

tracing/probes: Support $argN in return probe (kprobe and fprobe)

2024-03-07 00:27:34 +09:00

trace_recursion_record.c

…

trace_sched_switch.c

tracing: Move saved_cmdline code into trace_sched_switch.c

2024-03-17 07:58:53 -04:00

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

tracing: Support to dump instance traces by ftrace_dump_on_oops

2024-03-18 10:33:06 -04:00

trace_seq.c

trace_seq: Increase the buffer size to almost two pages

2023-12-18 23:14:16 -05:00

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_synth.h

…

trace_syscalls.c

…

trace_uprobe.c

tracing/probes: Support $argN in return probe (kprobe and fprobe)

2024-03-07 00:27:34 +09:00

trace.c

tracing: Support to dump instance traces by ftrace_dump_on_oops

2024-03-18 10:33:06 -04:00

trace.h

tracing: Add snapshot refcount

2024-03-18 10:12:47 -04:00

tracing_map.c

tracing: Ensure visibility when inserting an element into tracing_map

2024-01-22 17:15:40 -05:00

tracing_map.h

…