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

Cross-merge networking fixes after downstream PR (net-6.18-rc4).

No conflicts, adjacent changes:

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  ded9813d17 ("net: stmmac: Consider Tx VLAN offload tag length for maxSDU")
  26ab9830be ("net: stmmac: replace has_xxxx with core_type")

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

2025-10-31 06:46:03 -07:00

..

9p

…

bluetooth

Bluetooth: hci_core: Fix tracking of periodic advertisement

2025-10-24 10:31:59 -04:00

caif

…

iucv

net: reformat kdoc return statements

2024-12-09 14:44:59 -08:00

libeth

xdp, libeth: make the xdp_init_buff() micro-optimization generic

2025-09-08 10:26:25 -07:00

mana

net: mana: Use page pool fragments for RX buffers instead of full pages to improve memory efficiency.

2025-08-19 14:42:44 +02:00

netfilter

netfilter: fix typo in nf_conntrack_l4proto.h comment

2025-10-30 12:52:45 +01:00

netns

net/smc: make wr buffer count configurable

2025-10-30 13:31:43 +01:00

nfc

net: nfc: nci: Increase NCI_DATA_TIMEOUT to 3000 ms

2025-09-03 17:02:12 -07:00

page_pool

net: add helper to pre-check if PP for an Rx queue will be unreadable

2025-09-04 10:19:17 +02:00

phonet

…

psp

net: psp: don't assume reply skbs will have a socket

2025-10-03 10:23:50 -07:00

sctp

sctp: Constify struct sctp_sched_ops

2025-10-28 17:50:55 -07:00

tc_act

net_sched: act_skbmod: use RCU in tcf_skbmod_dump()

2025-08-28 16:46:23 -07:00

6lowpan.h

…

act_api.h

net_sched: act: remove tcfa_qstats

2025-09-02 15:52:24 -07:00

addrconf.h

ipv6: Add __in6_dev_get_rtnl_net().

2025-01-20 12:16:04 -08:00

af_ieee802154.h

…

af_rxrpc.h

rxrpc: Remove deadcode

2025-04-24 17:03:45 -07:00

af_unix.h

af_unix: Introduce SO_INQ.

2025-07-08 18:05:25 -07:00

af_vsock.h

vsock: fix vsock_proto declaration

2025-07-07 16:55:54 -07:00

ah.h

…

aligned_data.h

udp: move udp_memory_allocated into net_aligned_data

2025-07-02 14:22:02 -07:00

amt.h

…

arp.h

…

atmclip.h

…

ax25.h

ax25: Remove broken autobind

2025-03-24 10:26:53 +00:00

ax88796.h

…

bareudp.h

…

bond_3ad.h

bonding: support aggregator selection based on port priority

2025-09-09 10:56:02 +02:00

bond_alb.h

…

bond_options.h

bonding: add support for per-port LACP actor priority

2025-09-09 10:56:02 +02:00

bonding.h

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

2025-10-01 10:14:49 +02:00

bpf_sk_storage.h

…

busy_poll.h

net: gro: decouple GRO from the NAPI layer

2025-02-27 14:03:14 +01:00

calipso.h

…

cfg80211-wext.h

…

cfg80211.h

wifi: cfg80211: Add debugfs support for multi-radio wiphy

2025-10-27 09:18:41 +01:00

cfg802154.h

…

checksum.h

net: Fix checksum update for ILA adj-transport

2025-05-30 19:53:51 -07:00

cipso_ipv4.h

…

cls_cgroup.h

net/cls_cgroup: Fix task_get_classid() during qdisc run

2025-09-14 11:55:04 -07:00

codel_impl.h

…

codel_qdisc.h

…

codel.h

…

compat.h

…

datalink.h

…

dcbevent.h

…

dcbnl.h

…

devlink.h

devlink: Add a 'num_doorbells' driverinit param

2025-09-17 18:30:51 -07:00

dropreason-core.h

tcp: add datapath logic for PSP with inline key exchange

2025-09-18 12:32:06 +02:00

dropreason.h

wifi: mac80211: Drop cooked monitor support

2025-02-11 11:58:17 +01:00

dsa_stubs.h

…

dsa.h

net: dsa: tag_yt921x: add support for Motorcomm YT921x tags

2025-10-21 18:25:30 -07:00

dscp.h

…

dsfield.h

…

dst_cache.h

…

dst_metadata.h

net: dst_metadata: fix IP_DF bit not extracted from tunnel headers

2025-09-14 14:28:12 -07:00

dst_ops.h

…

dst.h

net: dst: introduce dst->dev_rcu

2025-08-29 19:36:31 -07:00

eee.h

…

erspan.h

…

esp.h

…

espintcp.h

…

ethoc.h

…

failover.h

…

fib_notifier.h

…

fib_rules.h

net: fib_rules: Fix iif / oif matching on L3 master device

2025-04-15 17:54:56 -07:00

firewire.h

…

flow_dissector.h

…

flow_offload.h

…

flow.h

ipv4: Convert ->flowi4_tos to dscp_t.

2025-08-26 17:34:31 -07:00

fou.h

…

fq_impl.h

…

fq.h

…

garp.h

…

gen_stats.h

…

genetlink.h

genetlink: fix typo in comment

2025-09-03 15:16:49 -07:00

geneve.h

…

gre.h

…

gro_cells.h

…

gro.h

net: gro: remove unnecessary df checks

2025-09-25 12:42:49 +02:00

gso.h

…

gtp.h

…

gue.h

…

handshake.h

…

hotdata.h

net: add NUMA awareness to skb_attempt_defer_free()

2025-09-30 15:45:53 +02:00

hwbm.h

…

icmp.h

ipv4: icmp: Pass IPv4 control block structure as an argument to __icmp_send()

2025-09-11 12:22:38 +02:00

ieee8021q.h

…

ieee80211_radiotap.h

wifi: mac80211: add RX flag to report radiotap VHT information

2025-10-30 08:38:51 +01:00

ieee802154_netdev.h

…

if_inet6.h

…

ife.h

…

inet6_connection_sock.h

tcp/dccp: Remove inet_connection_sock_af_ops.addr2sockaddr().

2025-03-24 12:10:13 -07:00

inet6_hashtables.h

tcp: Remove inet6_hash().

2025-09-22 11:38:43 -07:00

inet_common.h

…

inet_connection_sock.h

tcp: Update bind bucket state on port release

2025-09-23 10:12:15 +02:00

inet_dscp.h

ipv4: Convert ->flowi4_tos to dscp_t.

2025-08-26 17:34:31 -07:00

inet_ecn.h

…

inet_frag.h

inet: frags: change inet_frag_kill() to defer refcount updates

2025-03-18 13:18:36 +01:00

inet_hashtables.h

tcp: Update bind bucket state on port release

2025-09-23 10:12:15 +02:00

inet_sock.h

sctp: Remove sctp_copy_sock() and sctp_copy_descendant().

2025-10-27 18:04:59 -07:00

inet_timewait_sock.h

tcp: Update bind bucket state on port release

2025-09-23 10:12:15 +02:00

inetpeer.h

inetpeer: remove create argument of inet_getpeer()

2024-12-17 19:37:00 -08:00

ioam6.h

…

ip6_checksum.h

…

ip6_fib.h

ipv6: Defer fib6_purge_rt() in fib6_add_rt2node() to fib6_add().

2025-04-24 09:29:56 +02:00

ip6_route.h

ipv6: make ipv6_pinfo.daddr_cache a boolean

2025-09-18 10:17:09 +02:00

ip6_tunnel.h

ipv6: adopt skb_dst_dev() and skb_dst_dev_net[_rcu]() helpers

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

ip_fib.h

ipv4: Convert ->flowi4_tos to dscp_t.

2025-08-26 17:34:31 -07:00

ip_tunnels.h

net/ip6_tunnel: Prevent perpetual tunnel growth

2025-10-13 17:43:46 -07:00

ip_vs.h

ipvs: Fix estimator kthreads preferred affinity

2025-08-13 08:34:33 +02:00

ip.h

net: snmp: remove SNMP_MIB_SENTINEL

2025-09-08 18:06:21 -07:00

ipcomp.h

xfrm: ipcomp: Use crypto_acomp interface

2025-03-21 17:36:49 +08:00

ipconfig.h

…

ipv6_frag.h

inet: frags: change inet_frag_kill() to defer refcount updates

2025-03-18 13:18:36 +01:00

ipv6_stubs.h

…

ipv6.h

ipv6: fix _DEVADD() and _DEVUPD() macros

2025-03-25 07:31:24 -07:00

iw_handler.h

…

kcm.h

net: kcm: Fix race condition in kcm_unattach()

2025-08-13 18:18:33 -07:00

l3mdev.h

net: fib_rules: Fix iif / oif matching on L3 master device

2025-04-15 17:54:56 -07:00

lag.h

…

lapb.h

net: lapb: increase LAPB_HEADER_LEN

2024-12-06 17:43:08 -08:00

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

…

llc_conn.h

…

llc_if.h

…

llc_pdu.h

…

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

…

llc.h

…

lwtunnel.h

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

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

mac80211.h

wifi: mac80211: add RX flag to report radiotap VHT information

2025-10-30 08:38:51 +01:00

mac802154.h

…

macsec.h

net: macsec: Add endianness annotations in salt struct

2025-01-20 12:20:42 +00:00

mctp.h

net: mctp: Allow limiting binds to a peer address

2025-07-15 12:08:39 +02:00

mctpdevice.h

…

mip6.h

…

mld.h

…

mpls_iptunnel.h

…

mpls.h

…

mptcp.h

mptcp: sched: remove mptcp_sched_data

2025-04-15 08:21:46 -07:00

mrp.h

…

ncsi.h

…

ndisc.h

net: replace ND_PRINTK with dynamic debug

2025-07-10 15:27:32 -07:00

neighbour_tables.h

…

neighbour.h

neighbour: Convert rwlock of struct neigh_table to spinlock.

2025-10-24 17:57:20 -07:00

net_debug.h

Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2024-11-30 13:41:50 -08:00

net_failover.h

…

net_namespace.h

Merge tag 'namespace-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

2025-09-29 11:20:29 -07:00

net_ratelimit.h

…

net_shaper.h

…

net_trackers.h

…

netdev_lock.h

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

2025-05-22 09:42:41 -07:00

netdev_netlink.h

net: add granular lock for the netdev netlink socket

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

netdev_queues.h

net: add helper to pre-check if PP for an Rx queue will be unreadable

2025-09-04 10:19:17 +02:00

netdev_rx_queue.h

net: designate XSK pool pointers in queues as "ops protected"

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

netevent.h

…

netkit.h

…

netlabel.h

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

2024-11-21 08:28:08 -08:00

netlink.h

netlink: introduce type-checking attribute iteration for nlmsg

2025-07-02 15:39:04 -07:00

netmem.h

net: netmem: remove NET_IOV_MAX from net_iov_type enum

2025-10-28 17:41:46 -07:00

netprio_cgroup.h

…

netrom.h

…

nexthop.h

ipv6: Protect nh->f6i_list with spinlock and flag.

2025-04-24 09:29:56 +02:00

nl802154.h

nl802154: fix some kernel-doc warnings

2025-10-20 17:13:40 -07:00

nsh.h

…

pfcp.h

net: pfcp: fix typo in message_priority field name

2025-06-13 18:17:08 -07:00

pie.h

…

ping.h

inet: ping: remove ping_hash()

2025-09-01 13:15:14 -07:00

pkt_cls.h

net: sched: refine software bypass handling in tc_run

2025-01-20 09:21:27 +00:00

pkt_sched.h

net/sched: Remove unused typedef psched_tdiff_t

2025-10-27 18:05:54 -07:00

pptp.h

…

proto_memory.h

net: Allow opt-out from global protocol memory accounting.

2025-10-16 12:04:47 -07:00

protocol.h

…

psample.h

…

psnap.h

…

psp.h

psp: base PSP device support

2025-09-18 12:32:06 +02:00

raw.h

net: use NUMA drop counters for softnet_data.dropped

2025-09-14 11:35:17 -07:00

rawv6.h

…

red.h

…

regulatory.h

…

request_sock.h

tcp: reclaim 8 bytes in struct request_sock_queue

2025-09-22 17:55:25 -07:00

rose.h

net: rose: convert 'use' field to refcount_t

2025-08-27 07:43:08 -07:00

route.h

net: use dst_dev_rcu() in sk_setup_caps()

2025-08-29 19:36:32 -07:00

rpl.h

…

rps.h

net: Add rfs_needed() helper

2025-09-03 15:08:20 -07:00

rsi_91x.h

…

rstreason.h

net: Retire DCCP socket.

2025-04-11 18:58:10 -07:00

rtnetlink.h

rtnetlink: Remove "net" from newlink params

2025-02-21 15:28:03 -08:00

rtnh.h

…

sch_generic.h

net: dev_queue_xmit() llist adoption

2025-10-16 16:25:10 -07:00

scm.h

af_unix/scm: fix whitespace errors

2025-07-04 09:32:35 +02:00

secure_seq.h

net: Retire DCCP socket.

2025-04-11 18:58:10 -07:00

seg6_hmac.h

ipv6: sr: Prepare HMAC key ahead of time

2025-08-26 18:11:29 -07:00

seg6_local.h

…

seg6.h

…

selftests.h

…

slhc_vj.h

…

smc.h

dibs: Move event handling to dibs layer

2025-09-23 11:13:22 +02:00

snmp.h

net: snmp: remove SNMP_MIB_SENTINEL

2025-09-08 18:06:21 -07:00

sock_reuseport.h

…

sock.h

net: Add sk_clone().

2025-10-27 18:04:57 -07:00

Space.h

…

stp.h

…

strparser.h

strparser: Remove unused __strp_unpause

2025-05-05 16:48:12 -07:00

switchdev.h

…

tc_wrapper.h

…

tcp_ao.h

tcp: Free TCP-AO/TCP-MD5 info/keys without RCU

2025-09-11 19:05:56 -07:00

tcp_ecn.h

tcp: accecn: AccECN option failure handling

2025-09-18 08:47:52 +02:00

tcp_states.h

…

tcp.h

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

2025-10-31 06:46:03 -07:00

tcx.h

bpf: Remove location field in tcx_link

2025-07-11 11:00:57 -07:00

timewait_sock.h

tcp: Remove timewait_sock_ops.twsk_destructor().

2025-08-25 17:53:35 -07:00

tipc.h

…

tls_prot.h

…

tls_toe.h

…

tls.h

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

2025-10-31 06:46:03 -07:00

transp_v6.h

…

tso.h

…

tun_proto.h

…

udp_tunnel.h

udp_tunnel: fix deadlock in udp_tunnel_nic_set_port_priv()

2025-06-24 16:31:36 -07:00

udp.h

udp: remove busylock and add per NUMA queues

2025-09-23 16:38:39 -07:00

udplite.h

…

vsock_addr.h

…

vxlan.h

vxlan: Support MC routing in the underlay

2025-06-17 18:18:46 -07:00

wext.h

…

x25.h

net/x25: Remove unused x25_terminate_link()

2025-07-14 17:19:13 -07:00

x25device.h

…

xdp_priv.h

…

xdp_sock_drv.h

bpf: Allow bpf_xdp_shrink_data to shrink a frag from head and tail

2025-09-23 13:35:12 -07:00

xdp_sock.h

net: xsk: introduce XDP_MAX_TX_SKB_BUDGET setsockopt

2025-07-10 14:48:29 +02:00

xdp.h

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

2025-09-24 10:22:37 -07:00

xfrm.h

Revert "xfrm: destroy xfrm_state synchronously on net exit path"

2025-07-08 13:28:29 +02:00

xsk_buff_pool.h

xsk: Fix offset calculation in unaligned mode

2025-04-24 17:11:52 -07:00