Jakub Kicinski 357660d759 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR (net-6.14-rc5). Conflicts: drivers/net/ethernet/cadence/macb_main.c fa52f15c74 ("net: cadence: macb: Synchronize stats calculations") 75696dd0fd ("net: cadence: macb: Convert to get_stats64") https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au Adjacent changes: drivers/net/ethernet/intel/ice/ice_sriov.c 79990cf5e7 ("ice: Fix deinitializing VF in error path") a203163274 ("ice: simplify VF MSI-X managing") net/ipv4/tcp.c 18912c5206 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace") 297d389e9e ("net: prefix devmem specific helpers") net/mptcp/subflow.c 8668860b0a ("mptcp: reset when MPTCP opts are dropped after join") c3349a22c2 ("mptcp: consolidate subflow cleanup") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2025-02-27 10:20:58 -08:00
..
9p.h	9p: prevent read overrun in protocol dump tracepoint	2023-12-05 21:18:44 +09:00
afs.h	afs: Give an afs_server object a ref on the afs_cell object it points to	2025-02-21 15:06:29 -08:00
alarmtimer.h
amdxdna.h	accel/amdxdna: Add command execution	2024-11-22 11:43:27 -07:00
asoc.h	ALSA: trace: use snd_pcm_direction_name()	2024-08-01 12:50:03 +02:00
avc.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
bcache.h
block.h	block: remove the ioprio field from struct request	2024-11-12 14:42:02 -07:00
bpf_test_run.h	bpf: add bpf_modify_return_test_tp() kfunc triggering tracepoint	2024-03-28 18:31:40 -07:00
bridge.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
btrfs.h	btrfs: zoned: reclaim unused zone by zone resetting	2025-01-13 14:53:14 +01:00
cachefiles.h	cachefiles: Add auxiliary data trace	2024-12-20 22:34:05 +01:00
capability.h	security: add trace event for cap_capable	2024-12-04 20:59:21 -06:00
cgroup.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
clk.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
cma.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
compaction.h	mm: compaction: update the cc->nr_migratepages when allocating or freeing the freepages	2024-02-22 10:24:50 -08:00
context_tracking.h
cpuhp.h
csd.h	smp: Change function signatures to use call_single_data_t	2023-09-13 14:59:24 +02:00
damon.h	mm/damon: fix order of arguments in damos_before_apply tracepoint	2024-12-05 19:54:47 -08:00
devfreq.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
devlink.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
dlm.h	dlm: remove lkb from callback tracepoints	2024-04-01 13:31:12 -05:00
dma_fence.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
dma.h	dma-mapping: trace more error paths	2024-10-29 08:54:06 +01:00
erofs.h	erofs: get rid of z_erofs_map_blocks_iter_* tracepoints	2024-07-10 18:57:06 +08:00
error_report.h
ext4.h	ext4: remove tracing for FALLOC_FL_NO_HIDE_STALE	2024-08-28 16:53:57 +02:00
f2fs.h	f2fs: Remove calls to folio_file_mapping()	2024-12-16 16:12:26 +00:00
fib6.h	tracing: ipv6: Add flow label to fib6_table_lookup tracepoint	2024-12-19 16:02:22 +01:00
fib.h	net: Replace strlcpy with strscpy	2023-07-04 19:40:16 +01:00
filelock.h	filelock: split leases out of struct file_lock	2024-02-05 13:11:44 +01:00
filemap.h	filemap: add trace events for get_pages, map_pages, and fault	2024-09-01 20:26:10 -07:00
firewire_ohci.h	firewire: ohci: add tracepoints event for data of Self-ID DMA	2024-07-04 09:07:14 +09:00
firewire.h	firewire: core: rename cause flag of tracepoints event	2024-09-12 22:30:38 +09:00
fs_dax.h	dax: use huge_zero_folio	2024-04-25 20:56:20 -07:00
fscache.h	cachefiles: fix slab-use-after-free in fscache_withdraw_volume()	2024-07-03 10:36:14 +02:00
fsi_master_aspeed.h
fsi_master_ast_cf.h
fsi_master_gpio.h
fsi_master_i2cr.h	fsi: Add IBM I2C Responder virtual FSI master	2023-08-11 13:32:14 +09:30
fsi.h	fsi: core: Add trace events for scan and unregister	2023-08-09 15:43:28 +09:30
gpio.h
gpu_mem.h
habanalabs.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
handshake.h	net/handshake: Trace events for TLS Alert helpers	2023-07-28 14:07:59 -07:00
host1x.h
huge_memory.h	mm: khugepaged: fix the arguments order in khugepaged_collapse_file trace point	2024-10-17 00:28:09 -07:00
hugetlbfs.h	hugetlb: fix NULL pointer dereference in trace_hugetlbfs_alloc_inode	2025-01-12 19:03:36 -08:00
hw_pressure.h	sched/cpufreq: Rename arch_update_thermal_pressure() => arch_update_hw_pressure()	2024-04-24 12:08:01 +02:00
hwmon.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
i2c_slave.h
i2c.h
ib_mad.h
ib_umad.h
icmp.h	net/ipv4: add tracepoint for icmp_send	2024-05-08 10:39:26 +01:00
initcall.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
intel_ifs.h	trace: platform/x86/intel/ifs: Add SBAF trace support	2024-08-12 16:36:11 +02:00
intel_ish.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
intel-sst.h
io_uring.h	io_uring: clean up cqe trace points	2024-10-29 13:43:27 -06:00
iocost.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
iommu.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
ipi.h	trace: Add trace_ipi_send_cpu()	2023-03-24 11:01:29 +01:00
irq_matrix.h
irq.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
iscsi.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
jbd2.h	jbd2: remove journal_clean_one_cp_list()	2023-07-10 23:09:21 -04:00
kmem.h	mm: remove CONFIG_MEMCG_KMEM	2024-07-10 12:14:54 -07:00
ksm.h	mm/ksm: add tracepoint for ksm advisor	2023-12-29 11:58:27 -08:00
kvm.h	LoongArch: KVM: Add iocsr and mmio bus simulation in kernel	2024-11-13 16:18:26 +08:00
kyber.h	kyber: Replace strlcpy with strscpy	2023-07-17 08:18:17 -06:00
libata.h
lock.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
maple_tree.h
mce.h	x86/MCE/AMD: Add support for new MCA_SYND{1,2} registers	2024-10-31 10:36:07 +01:00
mctp.h
mdio.h	trace: events: cleanup deprecated strncpy uses	2024-04-05 22:10:25 -07:00
memcg.h	memcg: add flush tracepoint	2024-11-11 00:26:46 -08:00
migrate.h	mm/migrate: add MR_DAMON to migrate_reason	2024-07-03 19:30:12 -07:00
mlxsw.h
mmap_lock.h	mm: mmap_lock: optimize mmap_lock tracepoints	2025-01-13 22:40:34 -08:00
mmap.h	mm: mmap: remove newline at the end of the trace	2023-03-23 17:18:36 -07:00
mmc.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
mmflags.h	The various patchsets are summarized below. Plus of course many	2025-01-26 18:36:23 -08:00
module.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
mptcp.h	mptcp: sched: check both directions for backup	2024-07-30 10:27:29 +02:00
napi.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
nbd.h	nbd: Use NULL to represent a pointer	2024-05-14 07:22:35 -06:00
neigh.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
net_probe_common.h	trace: adjust TP_STORE_ADDR_PORTS_SKB() parameters	2024-04-03 19:26:14 -07:00
net.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
netfs.h	netfs: Fix a number of read-retry hangs	2025-02-13 16:00:38 +01:00
netlink.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
nilfs2.h	nilfs2: use __field_struct() for a bitwise field	2024-05-11 15:51:43 -07:00
nmi.h
notifier.h	notifiers: add tracepoints to the notifiers infrastructure	2023-04-08 13:45:38 -07:00
objagg.h
oom.h	mm: improve code consistency with zonelist_* helper functions	2024-09-01 20:25:55 -07:00
osnoise.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
page_isolation.h
page_pool.h	page_pool: devmem support	2024-09-11 20:44:31 -07:00
page_ref.h	trace/events/page_ref: trace the raw page mapcount value	2024-05-05 17:53:31 -07:00
pagemap.h
percpu.h
power_cpu_migrate.h
power.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
preemptirq.h	tracing: Remove definition of trace_*_rcuidle()	2024-10-08 21:17:39 -04:00
printk.h
pwc.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
pwm.h	pwm: Add tracing for waveform callbacks	2024-09-28 15:13:56 +02:00
qdisc.h	tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset()	2024-06-27 11:06:30 +02:00
qla.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
qrtr.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
rcu.h	context_tracking, rcu: Rename rcu_dyntick trace event into rcu_watching	2024-08-15 21:30:43 +05:30
rdma_core.h
regulator.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
rpcgss.h	SUNRPC: Fixup gss_status tracepoint error output	2024-07-18 10:49:15 -04:00
rpcrdma.h	svcrdma: Handle device removal outside of the CM event handler	2024-09-20 19:31:03 -04:00
rpm.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
rseq.h	tracing/rseq: Add mm_cid field to rseq_update	2022-12-27 12:52:15 +01:00
rtc.h
rust_sample.h	rust: samples: add tracepoint to Rust sample	2024-11-04 16:21:44 -05:00
rwmmio.h
rxrpc.h	rxrpc: Fix the rxrpc_connection attend queue handling	2025-02-04 15:30:28 +01:00
sched_ext.h	sched_ext: Print debug dump after an error exit	2024-06-18 10:09:18 -10:00
sched.h	tracing/sched: sched_switch: place prev_comm and next_comm in right order	2024-07-15 15:01:01 -04:00
scmi.h	include: trace: Widen the tag buffer in trace_scmi_dump_msg	2024-03-26 11:17:40 +00:00
scsi.h	scsi: sd: Atomic write support	2024-06-20 15:19:17 -06:00
sctp.h
signal.h
siox.h
skb.h	net: add rx_sk to trace_kfree_skb	2024-06-19 12:44:22 +01:00
smbus.h
sock.h	trace: events: cleanup deprecated strncpy uses	2024-04-05 22:10:25 -07:00
sof_intel.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
sof.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
spi.h	spi: Fix spelling typos and acronyms capitalization	2023-07-11 14:14:32 +01:00
spmi.h
sunrpc.h	SUNRPC: Prevent looping due to rpc_signal_task() races	2025-02-19 16:45:24 -05:00
sunvnet.h
swiotlb.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
syscalls.h	tracing: Declare system call tracepoints with TRACE_EVENT_SYSCALL	2024-10-09 17:05:54 -04:00
target.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
task.h	tracing: Remove pid in task_rename tracing output	2024-12-22 20:28:11 -08:00
tcp.h	trace: tcp: Add tracepoint for tcp_cwnd_reduction()	2025-02-18 15:29:53 +01:00
tegra_apb_dma.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
thp.h	powerpc/book3s64/mm: enable transparent pud hugepage	2023-08-18 10:12:55 -07:00
timer_migration.h	timers/migration: Rename childmask by groupmask to make naming more obvious	2024-07-22 18:03:34 +02:00
timer.h	tracing/timers: Add tracepoint for tracking timer base is_idle flag	2023-12-20 16:49:38 +01:00
timestamp.h	fs: tracepoints around multigrain timestamp events	2024-10-10 10:20:52 +02:00
tlb.h
udp.h	trace: adjust TP_STORE_ADDR_PORTS_SKB() parameters	2024-04-03 19:26:14 -07:00
v4l2.h
vb2.h
vmalloc.h
vmscan.h	vmscan: add a vmscan event for reclaim_pages	2024-11-06 20:11:13 -08:00
vsock_virtio_transport_common.h	vsock/virtio: MSG_ZEROCOPY flag support	2023-09-21 12:34:00 +02:00
watchdog.h
wbt.h	blk-wbt: Replace strlcpy with strscpy	2023-07-17 08:18:17 -06:00
workqueue.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
writeback.h	writeback: Refine the show_inode_state() macro definition	2024-08-30 08:22:41 +02:00
xdp.h	tracing/treewide: Remove second parameter of __assign_str()	2024-05-22 20:14:47 -04:00
xen.h	x86/xen: move paravirt lazy code	2023-09-19 07:04:49 +02:00