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

Cross-merge networking fixes after downstream PR (net-6.15-rc2).

Conflict:

Documentation/networking/netdevices.rst
net/core/lock_debug.c
  04efcee6ef ("net: hold instance lock during NETDEV_CHANGE")
  03df156dd3 ("xdp: double protect netdev->xdp_flags with netdev->lock")

No adjacent changes.

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

2025-04-10 16:51:07 -07:00

..

bpf_sk_storage.c

bpf: Remove unnecessary BTF lookups in bpf_sk_storage_tracing_allowed

2025-01-29 08:51:51 -08:00

datagram.c

net: Drop unused @sk of __skb_try_recv_from_queue()

2025-04-08 18:23:51 -07:00

dev_addr_lists_test.c

net: dev_addr_lists: move locking out of init/exit in kunit

2024-04-15 10:26:35 +01:00

dev_addr_lists.c

net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode

2025-01-14 12:17:27 +01:00

dev_api.c

net: hold instance lock during NETDEV_CHANGE

2025-04-07 11:13:39 -07:00

dev_ioctl.c

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

2025-03-26 09:32:10 -07:00

dev.c

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

2025-04-10 16:51:07 -07:00

dev.h

netdev: add "ops compat locking" helpers

2025-04-09 17:01:51 -07:00

devmem.c

net: avoid false positive warnings in __net_mp_close_rxq()

2025-04-04 07:35:38 -07:00

devmem.h

net: prepare for non devmem TCP memory providers

2025-02-06 16:27:31 -08:00

drop_monitor.c

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

dst_cache.c

net: dst_cache: add two DEBUG_NET warnings

2024-06-03 18:50:09 -07:00

dst.c

net: decrease cached dst counters in dst_release

2025-04-03 13:05:07 +02:00

failover.c

net: failover: use IFF_NO_ADDRCONF flag to prevent ipv6 addrconf

2022-12-12 15:18:25 -08:00

fib_notifier.c

net: do not acquire rtnl in fib_seq_sum()

2024-10-11 15:35:05 -07:00

fib_rules.c

net: fib_rules: Enable DSCP mask usage

2025-02-21 16:08:48 -08:00

filter.c

Merge tag 'bpf-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2025-03-30 12:43:03 -07:00

flow_dissector.c

net: remove '__' from __skb_flow_get_ports()

2025-02-24 14:27:53 -08:00

flow_offload.c

tc: flower: Enable offload support IPSEC SPI field.

2023-08-02 10:09:32 +01:00

gen_estimator.c

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

gen_stats.c

net: Remove the obsolte u64_stats_fetch_*_irq() users (net).

2022-10-28 20:13:54 -07:00

gro_cells.c

net: move netdev_max_backlog to net_hotdata

2024-03-07 21:12:42 -08:00

gro.c

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

2025-02-27 10:20:58 -08:00

gso.c

net: introduce struct net_hotdata

2024-03-07 21:12:41 -08:00

hotdata.c

net: introduce per netns packet chains

2025-03-24 13:58:22 -07:00

hwbm.c

…

ieee8021q_helpers.c

net: add IEEE 802.1q specific helpers

2024-05-08 10:35:09 +01:00

link_watch.c

net: hold instance lock during NETDEV_CHANGE

2025-04-07 11:13:39 -07:00

lock_debug.c

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

2025-04-10 16:51:07 -07:00

lwt_bpf.c

bpf: lwtunnel: Prepare bpf_lwt_xmit_reroute() to future .flowi4_tos conversion.

2024-11-14 19:07:49 -08:00

lwtunnel.c

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

2025-03-20 21:38:01 +01:00

Makefile

net: rename rtnl_net_debug to lock_debug

2025-04-03 15:32:08 -07:00

mp_dmabuf_devmem.h

memory-provider: dmabuf devmem memory provider

2024-09-11 20:44:31 -07:00

neighbour.c

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

net_namespace.c

net: introduce per netns packet chains

2025-03-24 13:58:22 -07:00

net_test.c

pfcp: always set pfcp metadata

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

net-procfs.c

net: add data-race annotations in softnet_seq_show()

2025-04-08 12:30:55 -07:00

net-sysfs.c

net: designate queue counts as "double ops protected" by instance lock

2025-03-25 10:06:49 -07:00

net-sysfs.h

net-sysfs: add netdev_change_owner()

2020-02-26 20:07:25 -08:00

net-traces.c

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

netclassid_cgroup.c

cgroup, netclassid: on modifying netclassid in cgroup, only consider the main process.

2023-10-16 16:36:53 -07:00

netdev_rx_queue.c

net: avoid false positive warnings in __net_mp_close_rxq()

2025-04-04 07:35:38 -07:00

netdev-genl-gen.c

net: create netdev_nl_sock to wrap bindings list

2025-03-12 13:32:35 -07:00

netdev-genl-gen.h

net: create netdev_nl_sock to wrap bindings list

2025-03-12 13:32:35 -07:00

netdev-genl.c

netdev: depend on netdev->lock for qstats in ops locked drivers

2025-04-09 17:01:52 -07:00

netevent.c

net: core: Correct function name netevent_unregister_notifier() in the kerneldoc

2021-03-28 17:56:56 -07:00

netmem_priv.h

page_pool: devmem support

2024-09-11 20:44:31 -07:00

netpoll.c

netpoll: Eliminate redundant assignment

2025-03-24 13:42:53 -07:00

netprio_cgroup.c

bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode

2021-09-13 16:35:58 -07:00

of_net.c

net: Explicitly include correct DT includes

2023-07-27 20:33:16 -07:00

page_pool_priv.h

net: page_pool: don't try to stash the napi id

2025-01-27 14:37:41 -08:00

page_pool_user.c

net: use napi_id_valid helper

2025-02-17 16:43:04 -08:00

page_pool.c

net: protect rxq->mp_params with the instance lock

2025-03-25 10:06:49 -07:00

pktgen.c

net: pktgen: add strict buffer parsing index check

2025-03-24 12:01:37 -07:00

ptp_classifier.c

ptp: Add generic PTP is_sync() function

2022-03-07 11:31:34 +00:00

request_sock.c

tcp: make sure init the accept_queue's spinlocks once

2024-01-19 21:13:25 -08:00

rtnetlink.c

rtnetlink: Fix bad unlock balance in do_setlink().

2025-04-08 12:33:22 -07:00

scm.c

tcp: devmem: don't write truncated dmabuf CMSGs to userspace

2025-02-25 18:15:43 -08:00

secure_seq.c

tcp: use EXPORT_IPV6_MOD[_GPL]()

2025-02-14 13:09:39 -08:00

selftests.c

net: phy: Support speed selection for PHY loopback

2025-03-20 08:45:08 +01:00

skb_fault_injection.c

net: Implement fault injection forcing skb reallocation

2024-11-12 12:05:33 +01:00

skbuff.c

net-timestamp: COMPLETION timestamp on packet tx completion

2025-03-25 12:48:05 -04:00

skmsg.c

bpf: Fix wrong copied_seq calculation

2025-01-29 13:32:23 -08:00

sock_destructor.h

skb_expand_head() adjust skb->truesize incorrectly

2021-10-22 12:35:51 -07:00

sock_diag.c

net: use unrcu_pointer() helper

2024-06-06 11:52:52 +02:00

sock_map.c

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

2025-02-20 15:37:17 -08:00

sock_reuseport.c

net: core: annotate socks of struct sock_reuseport with __counted_by

2024-08-02 17:16:59 -07:00

sock.c

Merge tag 'net-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2025-04-10 08:52:18 -07:00

stream.c

net: Return error from sk_stream_wait_connect() if sk_wait_event() fails

2023-12-15 10:48:51 +00:00

sysctl_net_core.c

net: rps: remove kfree_rcu_mightsleep() use

2025-04-08 12:30:55 -07:00

timestamping.c

net: Add the possibility to support a selected hwtstamp in netdevice

2024-12-16 12:51:40 +00:00

tso.c

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

utils.c

net: Correct spelling in net/core

2024-08-26 09:37:23 -07:00

xdp.c

xdp: double protect netdev->xdp_flags with netdev->lock

2025-04-09 17:01:52 -07:00