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

Cross-merge networking fixes after downstream PR (net-7.1-rc6).

Conflicts:

drivers/net/phy/air_en8811h.c
  d895767c33 ("net: phy: air_en8811h: add AN8811HB MCU assert/deassert support")
  dddfadd751 ("net: phy: Add Airoha phy library for shared code")
  5226bb6634 ("net: phy: air_phy_lib: Factorize BuckPBus register accessors")
  e08f0ea6da ("net: phy: Rename Airoha common BuckPBus register accessors")

net/sched/sch_netem.c
  a2f6ed7b48 ("net/sched: netem: add per-impairment extended statistics")
  9552b11e3e ("net/sched: fix packet loop on netem when duplicate is on")

Adjacent changes:

drivers/dpll/zl3073x/core.c
  c1224569ce ("dpll: zl3073x: make frequency monitor a per-device attribute")
  54e65df8cf ("dpll: zl3073x: report FFO as DPLL vs input reference offset")

net/iucv/af_iucv.c
  347fdd4df8 ("af_iucv: convert to getsockopt_iter")
  3589d20a66 ("net/iucv: fix locking in .getsockopt")

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

2026-05-28 14:02:21 -07:00

..

bpf_sk_storage.c

bpf: Fix sk_local_storage diag dumping uninitialized special fields

2026-04-24 11:21:34 -07:00

datagram.c

net: datagram: introduce datagram_poll_queue for custom receive queues

2025-10-23 15:46:04 +02:00

dev_addr_lists_test.c

net: cache snapshot entries for ndo_set_rx_mode_async

2026-04-21 12:50:13 +02:00

dev_addr_lists.c

net: warn ops-locked drivers still using ndo_set_rx_mode

2026-04-21 12:50:25 +02:00

dev_api.c

net: introduce ndo_set_rx_mode_async and netdev_rx_mode_work

2026-04-21 12:50:03 +02:00

dev_ioctl.c

net: introduce ndo_set_rx_mode_async and netdev_rx_mode_work

2026-04-21 12:50:03 +02:00

dev.c

net: defer netdev_name_node_alt_flush() call to netdev_run_todo()

2026-05-26 19:20:15 -07:00

dev.h

net: introduce ndo_set_rx_mode_async and netdev_rx_mode_work

2026-04-21 12:50:03 +02:00

devmem.c

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

2026-05-21 15:09:02 -07:00

devmem.h

net: devmem: support TX over NETMEM_TX_NO_DMA devices

2026-05-18 18:49:06 -07:00

drop_monitor.c

net: constify sk_skb_reason_drop() sock parameter

2026-05-12 18:31:11 -07:00

dst_cache.c

net: dst: annotate data-races around dst->obsolete

2025-07-02 14:32:29 -07:00

dst.c

treewide: Replace kmalloc with kmalloc_obj for non-scalar types

2026-02-21 01:02:28 -08:00

failover.c

net: net_failover: Fix the deadlock in slave register

2026-05-13 19:01:03 -07:00

fib_notifier.c

net: Add SPDX ids to some source files

2026-03-09 18:32:45 -07:00

fib_rules.c

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

2025-04-17 12:26:50 -07:00

filter.c

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

2026-05-09 18:42:54 -07:00

flow_dissector.c

flow_dissector: do not dissect PPPoE PFC frames

2026-04-20 11:35:16 -07:00

flow_offload.c

Convert more 'alloc_obj' cases to default GFP_KERNEL arguments

2026-02-21 20:03:00 -08:00

gen_estimator.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

gen_stats.c

net/sched: add const qualifiers to gnet_stats helpers

2026-05-11 18:28:08 -07:00

gro_cells.c

treewide: Replace kmalloc with kmalloc_obj for non-scalar types

2026-02-21 01:02:28 -08:00

gro.c

net: gro: don't merge zcopy skbs

2026-05-21 08:21:33 -07:00

gso.c

…

hotdata.c

net: remove EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL() macros

2026-03-29 11:21:22 -07:00

hwbm.c

…

ieee8021q_helpers.c

net: ieee8021q: fix insufficient table-size assertion

2025-07-01 12:55:49 +02:00

link_watch.c

net/sched: do not reset queues in graft operations

2026-03-09 18:55:55 -07:00

lock_debug.c

netdev: fix the locking for netdev notifications

2025-04-17 18:55:14 -07:00

lwt_bpf.c

bpf: remove ipv6_bpf_stub completely and use direct function calls

2026-03-29 11:21:24 -07:00

lwtunnel.c

inet: Remove rtnl_is_held arg of lwtunnel_valid_encap_type(_attr)?().

2025-05-20 19:18:24 -07:00

Makefile

net: get rid of net/core/request_sock.c

2026-02-05 09:23:05 -08:00

mp_dmabuf_devmem.h

…

neighbour.c

neigh: let neigh_xmit take skb ownership

2026-04-27 19:02:11 -07:00

net_namespace.c

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

2026-04-14 18:36:10 -07:00

net_test.c

…

net-procfs.c

net: add proper RCU protection to /proc/net/ptype

2026-02-03 19:20:30 -08:00

net-sysfs.c

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

2026-04-14 18:36:10 -07:00

net-sysfs.h

net: add skb_defer_disable_key static key

2026-03-12 19:25:33 -07:00

net-traces.c

…

netclassid_cgroup.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

netdev_config.c

net: add queue config validation callback

2026-01-23 11:49:02 -08:00

netdev_queues.c

net: remove the netif_get_rx_queue_lease_locked() helpers

2026-04-09 18:26:28 -07:00

netdev_rx_queue.c

net: Rename ifq_idx to rxq_idx in netif_mp_* helpers

2026-04-12 09:12:07 -07:00

netdev-genl-gen.c

net: page_pool: support dumping pps of a specific ifindex via Netlink

2026-05-08 14:54:55 -07:00

netdev-genl-gen.h

net: Add queue-create operation

2026-04-09 18:21:45 -07:00

netdev-genl.c

net: devmem: support TX over NETMEM_TX_NO_DMA devices

2026-05-18 18:49:06 -07:00

netevent.c

…

netmem_priv.h

Revert "mm: introduce a new page type for page pool in page type"

2026-05-21 19:06:13 -07:00

netpoll.c

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

2026-05-21 15:09:02 -07:00

netprio_cgroup.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

of_net.c

…

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: page_pool: silence static analysis warnings in page_pool_nl_stats_fill()

2026-05-27 17:37:50 -07:00

page_pool.c

Revert "mm: introduce a new page type for page pool in page type"

2026-05-21 19:06:13 -07:00

pktgen.c

kernel.h: drop hex.h and update all hex.h users

2026-01-20 19:44:19 -08:00

ptp_classifier.c

…

rtnetlink.c

rtnetlink: add RTEXT_FILTER_NAME_ONLY support to rtnl_dump_ifinfo()

2026-05-26 19:20:15 -07:00

scm.c

net: use ktime_t in struct scm_timestamping_internal

2026-03-04 17:53:34 -08:00

secure_seq.c

tcp: secure_seq: add back ports to TS offset

2026-03-04 17:44:35 -08:00

selftests.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

skb_fault_injection.c

net: Implement fault injection forcing skb reallocation

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

skbuff.c

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

2026-05-28 14:02:21 -07:00

skmsg.c

bpf, skmsg: fix verdict sk_data_ready racing with ktls rx

2026-05-20 17:21:21 -07:00

sock_diag.c

net: Add SPDX ids to some source files

2026-03-09 18:32:45 -07:00

sock_map.c

sockmap: Fix sk_psock_drop() race vs sock_map_{unhash,close,destroy}().

2026-04-23 18:24:02 -07:00

sock_reuseport.c

treewide: Replace kmalloc with kmalloc_obj for non-scalar types

2026-02-21 01:02:28 -08:00

sock.c

net: make is_skb_wmem() available to modules

2026-05-13 19:13:41 -07:00

stream.c

net: stream: add description for sk_stream_write_space()

2025-07-18 16:57:21 -07:00

sysctl_net_core.c

net: add skb_defer_disable_key static key

2026-03-12 19:25:33 -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

net: tso: Introduce tso_dma_map and helpers

2026-04-12 10:54:31 -07:00

utils.c

kernel.h: drop hex.h and update all hex.h users

2026-01-20 19:44:19 -08:00

xdp.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00