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

Merge in late fixes in preparation for the net-next PR.

Conflicts:

net/tls/tls_sw.c
  406e8a651a ("net: skmsg: preserve sg.copy across SG transforms")
  79511603a6 ("tls: remove dead sockmap (psock) handling from the SW path")

drivers/net/ethernet/microsoft/mana/mana_en.c
  f8fd56977e ("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check")
  d07efe5a6e ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size")
https://lore.kernel.org/ajAPXu-C_PuTgV-a@sirena.org.uk

No adjacent changes.

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

2026-06-16 14:59:58 -07:00

..

9p

9p: document missing enum values in kernel-doc comments

2026-04-16 02:57:01 +00:00

bluetooth

Bluetooth: L2CAP: Fix UAF in channel timeout by holding conn ref

2026-06-11 14:24:41 -04:00

iucv

treewide: Replace kmalloc with kmalloc_obj for non-scalar types

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

libeth

libeth, idpf: use truesize as XDP RxQ info frag_size

2026-03-05 08:02:05 -08:00

mana

net: mana: Cache MANA_QUERY_LINK_CONFIG result to avoid repeated HWC queries

2026-06-09 17:56:21 -07:00

netfilter

Merge tag 'nf-next-26-06-14' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next

2026-06-15 14:09:57 -07:00

netns

ip6mr: Define net->ipv6.{ip6mr_notifier_ops,ipmr_seq} under CONFIG_IPV6_MROUTE.

2026-06-08 17:06:24 -07:00

nfc

nfc: nci: Fix race between rfkill and nci_unregister_device().

2026-01-28 19:32:26 -08:00

page_pool

net: make page_pool_get_stats() void

2026-05-28 18:10:03 -07:00

phonet

…

phy

…

psp

psp: add new netlink cmd for dev-assoc and dev-disassoc

2026-06-12 18:31:32 -07:00

sctp

sctp: correct CONFIG_SCTP_DBG_OBJCNT macro name in comment

2026-06-15 15:52:54 -07:00

tc_act

net/sched: fix pedit partial COW leading to page cache corruption

2026-06-04 08:29:02 -07:00

6lowpan.h

…

act_api.h

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

2026-06-04 15:29:04 -07:00

addrconf.h

ipv6: guard against possible NULL deref in __in6_dev_stats_get()

2026-05-27 17:27:26 -07:00

af_ieee802154.h

…

af_rxrpc.h

…

af_unix.h

…

af_vsock.h

vsock: introduce vsock_pending_to_accept() helper

2026-06-13 10:38:27 -07:00

ah.h

…

aligned_data.h

…

amt.h

amt: Store struct sock in struct amt_dev.

2026-05-05 17:47:05 -07:00

arp.h

…

ax25.h

net: remove ax25 and amateur radio (hamradio) subsystem

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

ax88796.h

…

bareudp.h

…

bond_3ad.h

bonding: 3ad: implement proper RCU rules for port->aggregator

2026-04-29 18:32:02 -07:00

bond_alb.h

…

bond_options.h

bonding: 3ad: add lacp_strict configuration knob

2026-06-10 07:53:26 -07:00

bonding.h

bonding: 3ad: add lacp_strict configuration knob

2026-06-10 07:53:26 -07:00

bpf_sk_storage.h

…

busy_poll.h

…

calipso.h

…

can.h

can: add CAN skb extension infrastructure

2026-02-05 11:58:39 +01:00

cfg80211-wext.h

…

cfg80211.h

wifi: nl80211: Increase ie_len size to prevent truncated IEs in new peer notifications

2026-06-05 10:00:04 +02:00

cfg802154.h

…

checksum.h

…

cipso_ipv4.h

…

cls_cgroup.h

…

codel_impl.h

codel: annotate data-races in codel_dump_stats()

2026-04-08 19:18:52 -07:00

codel_qdisc.h

…

codel.h

…

compat.h

…

datalink.h

…

dcbevent.h

…

dcbnl.h

…

devlink.h

devlink: Implement devlink param multi attribute nested data values

2026-06-13 16:16:58 -07:00

dropreason-core.h

ipv6: Implement limits on extension header parsing

2026-04-30 17:21:45 -07:00

dropreason-qdisc.h

net: sched: sch_dualpi2: use qdisc_dequeue_drop() for dequeue drops

2026-02-28 15:31:35 -08:00

dropreason.h

net: sched: introduce qdisc-specific drop reason tracing

2026-02-28 15:31:34 -08:00

dsa_stubs.h

…

dsa.h

net: dsa: add NETC switch tag support

2026-05-21 13:04:42 +02:00

dscp.h

…

dsfield.h

…

dst_cache.h

…

dst_metadata.h

…

dst_ops.h

…

dst.h

inet: add dst4_mtu() and dst6_mtu() helpers

2026-02-02 17:49:29 -08:00

eee.h

…

erspan.h

…

esp.h

…

espintcp.h

…

ethoc.h

…

failover.h

…

fib_notifier.h

…

fib_rules.h

net: fib_rules: Don't dump dying fib_rule in fib_rules_dump().

2026-06-11 15:14:03 -07:00

firewire.h

…

flow_dissector.h

…

flow_offload.h

net: dsa: eliminate local type for tc policers

2026-02-10 15:30:11 +01:00

flow.h

…

fou.h

…

fq_impl.h

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

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

fq.h

…

garp.h

…

gen_stats.h

net/sched: add const qualifiers to gnet_stats helpers

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

genetlink.h

genetlink: free the skb on 'group >= family->n_mcgrps'

2026-05-08 15:43:29 -07:00

geneve.h

…

gre.h

…

gro_cells.h

…

gro.h

…

gso.h

…

gtp.h

…

gue.h

…

handshake.h

…

hotdata.h

net-sysfs: use rps_tag_ptr and remove metadata from rps_sock_flow_table

2026-03-04 16:54:09 -08:00

hwbm.h

…

icmp.h

…

ieee8021q.h

…

ieee80211_radiotap.h

…

ieee802154_netdev.h

…

if_inet6.h

…

ife.h

…

inet6_connection_sock.h

tcp: move inet6_csk_update_pmtu() to tcp_ipv6.c

2026-02-24 17:47:27 -08:00

inet6_hashtables.h

tcp: Initialise ehash secrets during connect() and listen().

2026-03-05 18:50:05 -08:00

inet_common.h

net: remove addr_len argument of recvmsg() handlers

2026-03-02 18:17:17 -08:00

inet_connection_sock.h

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

2026-02-26 10:23:00 -08:00

inet_dscp.h

…

inet_ecn.h

tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers

2026-02-03 15:13:24 +01:00

inet_frag.h

…

inet_hashtables.h

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

2026-03-26 12:09:57 -07:00

inet_sock.h

ipv6: colocate inet6_cork in inet_cork_full

2026-02-02 17:49:30 -08:00

inet_timewait_sock.h

…

inetpeer.h

…

ioam6.h

ipv6: ioam: fix heap buffer overflow in __ioam6_fill_trace_data()

2026-02-13 12:24:05 -08:00

ip6_checksum.h

udp: move udp6_csum_init() back to net/ipv6/udp.c

2026-02-24 16:30:40 -08:00

ip6_fib.h

ipv6: remove ipv6_stub infrastructure completely

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

ip6_route.h

ipv6: prepare headers for ipv6_stub removal

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

ip6_tunnel.h

net: dropreason: add SKB_DROP_REASON_RECURSION_LIMIT

2026-03-14 08:38:06 -07:00

ip_fib.h

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

2026-06-16 14:59:58 -07:00

ip_tunnels.h

net: increase IP_TUNNEL_RECURSION_LIMIT to 5

2026-04-03 15:52:10 -07:00

ip_vs.h

ipvs: add conn_max sysctl to limit connections

2026-06-05 13:11:54 +02:00

ip.h

net: remove EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL() macros

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

ipcomp.h

…

ipconfig.h

…

ipv6_frag.h

…

ipv6.h

tcp: rehash onto different local ECMP path on retransmit timeout

2026-06-15 15:57:31 -07:00

iw_handler.h

…

kcm.h

…

l3mdev.h

net: l3mdev: use skb_dst_dev_rcu() in l3mdev_l3_out()

2026-02-02 17:09:11 -08:00

lag.h

…

lapb.h

…

llc_c_ac.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_c_ev.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_c_st.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_conn.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_if.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_pdu.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_s_ac.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_s_ev.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_s_st.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc_sap.h

llc: Add SPDX id lines to llc header files

2026-05-26 17:27:14 -07:00

llc.h

llc: Add SPDX id lines to some llc source files

2026-05-26 17:26:57 -07:00

lwtunnel.h

…

mac80211.h

wifi: mac80211: Add 802.3 multicast encapsulation offload support

2026-06-05 16:12:26 +02:00

mac802154.h

…

macsec.h

macsec: use rcu_work to defer TX SA crypto cleanup out of softirq

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

mctp.h

net: mctp: fix don't require received header reserved bits to be zero

2026-04-20 11:46:57 -07:00

mctpdevice.h

…

mip6.h

…

mld.h

ipv6: mld: encode multicast exponential fields

2026-05-04 19:09:41 -07:00

mpls_iptunnel.h

…

mpls.h

…

mptcp.h

tcp: allow mptcp to drop TS for some packets

2026-06-11 15:33:37 -07:00

mrp.h

…

ncsi.h

net: ncsi: Set ncsi_stop_dev() to inline while NET_NCSI not enabled

2026-06-09 17:18:51 -07:00

ndisc.h

ipv6: remove ipv6_stub infrastructure completely

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

neighbour_tables.h

…

neighbour.h

netfilter: br_netfilter: Reallocate headroom if necessary in neigh_hh_bridge()

2026-05-16 13:22:50 +02:00

net_debug.h

…

net_failover.h

…

net_namespace.h

kernfs: pass struct ns_common instead of const void * for namespace tags

2026-04-09 14:36:52 +02:00

net_ratelimit.h

…

net_shaper.h

net: shaper: rework the VALID marking (again)

2026-05-20 16:34:20 -07:00

net_trackers.h

…

netdev_lock.h

net: ethtool: make dev->hwprov ops-protected

2026-06-09 10:13:04 -07:00

netdev_netlink.h

…

netdev_queues.h

net: Proxy netdev_queue_get_dma_dev for leased queues

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

netdev_rx_queue.h

net: remove the netif_get_rx_queue_lease_locked() helpers

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

netevent.h

…

netkit.h

…

netlabel.h

…

netlink.h

netlink: add one debug check in nla_nest_end()

2026-05-14 16:49:26 -07:00

netmem.h

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

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

netprio_cgroup.h

…

nexthop.h

…

nl802154.h

…

nsh.h

net: nsh: fix incorrect header length macros

2026-05-08 15:32:59 -07:00

pfcp.h

…

pie.h

net/sched: sch_pie: annotate data-races in pie_dump_stats()

2026-04-22 21:12:47 -07:00

ping.h

net: remove addr_len argument of recvmsg() handlers

2026-03-02 18:17:17 -08:00

pkt_cls.h

net/sched: tbf: add extack to offload params

2026-05-22 17:23:37 -07:00

pkt_sched.h

net/sched: don't use dynamic lockdep keys with clsact/ingress/noqueue

2026-02-05 09:32:45 -08:00

pptp.h

…

proto_memory.h

…

protocol.h

…

psample.h

…

psnap.h

…

psp.h

…

raw.h

…

rawv6.h

…

red.h

…

regulatory.h

…

request_sock.h

tcp: move __reqsk_free() out of line

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

rose.h

net: remove ax25 and amateur radio (hamradio) subsystem

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

route.h

…

rpl.h

…

rps-types.h

net: add rps_tag_ptr type and helpers

2026-03-04 16:54:09 -08:00

rps.h

net-sysfs: use rps_tag_ptr and remove metadata from rps_dev_flow_table

2026-03-04 16:54:10 -08:00

rsi_91x.h

…

rstreason.h

…

rtnetlink.h

…

rtnh.h

…

sch_generic.h

net/sched: Update function name in TCQ_F_NOPARENT comment

2026-06-09 12:08:31 +02:00

sch_priv.h

…

scm.h

…

secure_seq.h

tcp: secure_seq: add back ports to TS offset

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

seg6_hmac.h

…

seg6_local.h

…

seg6.h

…

selftests.h

…

slhc_vj.h

…

smc.h

smc: Use flexible array for SMCD connections

2026-05-20 17:13:18 -07:00

snmp.h

…

sock_reuseport.h

…

sock.h

tcp: rehash onto different local ECMP path on retransmit timeout

2026-06-15 15:57:31 -07:00

stp.h

…

strparser.h

…

switchdev.h

bridge: No DEV_PATH_BR_VLAN_UNTAG_HW for dsa foreign

2026-03-19 13:14:00 +01:00

tc_wrapper.h

net/sched: refine indirect call mitigation in tc_wrapper.h

2026-03-09 19:31:41 -07:00

tcp_ao.h

net/tcp-ao: Return void from functions that can no longer fail

2026-04-30 09:38:56 +02:00

tcp_ecn.h

tcp: annotate data-races around tp->delivered and tp->delivered_ce

2026-04-18 11:10:12 -07:00

tcp_states.h

…

tcp.h

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

2026-06-16 14:59:58 -07:00

tcx.h

…

timewait_sock.h

…

tipc.h

…

tls_prot.h

…

tls.h

tls: remove tls_toe and the related driver

2026-06-12 16:43:10 -07:00

transp_v6.h

ipv6: Retire UDP-Lite.

2026-03-13 18:57:44 -07:00

tso.h

net: tso: Introduce tso_dma_map and helpers

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

tun_proto.h

…

udp_tunnel.h

udp_tunnel: Pass struct sock to udp_tunnel_notify_{add,del}_rx_port().

2026-05-05 17:47:04 -07:00

udp.h

udp: Don't pass udptable to IPv4 socket lookup functions.

2026-03-13 18:57:46 -07:00

vsock_addr.h

…

vxlan.h

vxlan: Free vxlan_sock with kfree_rcu().

2026-05-05 17:47:05 -07:00

wext.h

…

x25.h

…

x25device.h

…

xdp_priv.h

…

xdp_sock_drv.h

xsk: respect tailroom for ZC setups

2026-04-06 18:43:51 -07:00

xdp_sock.h

xsk: fix XDP_UMEM_SG_FLAG issues

2026-04-06 18:43:51 -07:00

xdp.h

…

xfrm.h

Merge tag 'ipsec-next-2026-06-12' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2026-06-13 13:16:39 -07:00

xsk_buff_pool.h

xsk: remove repeated defines

2026-03-16 19:28:21 -07:00