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

Cross-merge networking fixes after downstream PR (net-6.17-rc5).

No conflicts.

Adjacent changes:

include/net/sock.h
  c51613fa27 ("net: add sk->sk_drop_counters")
  5d6b58c932 ("net: lockless sock_i_ino()")

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

2025-09-04 13:33:00 -07:00

..

9p

…

bluetooth

Bluetooth: hci_sync: fix set_local_name race condition

2025-08-22 13:57:31 -04:00

caif

…

iucv

…

libeth

libeth: xdp: access ->pp through netmem_desc instead of page

2025-07-23 17:46:56 -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: nft_payload: extend offset to 65535 bytes

2025-09-02 15:28:18 +02:00

netns

inet: ping: make ping_port_rover per netns

2025-09-01 13:15:14 -07: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

…

sctp

sctp: Convert cookie authentication to use HMAC-SHA256

2025-08-19 19:36:26 -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

…

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: update LACP activity flag after setting lacp_active

2025-08-21 09:35:20 +02:00

bond_alb.h

…

bond_options.h

net: bonding: add broadcast_neighbor option for 802.3ad

2025-07-08 10:59:41 +02:00

bonding.h

bonding: Remove support for use_carrier

2025-09-02 14:01:54 -07: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/mac80211: report link ID for unexpected frames

2025-07-21 19:40:59 +02: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

…

codel_impl.h

…

codel_qdisc.h

…

codel.h

…

compat.h

…

datalink.h

…

dcbevent.h

…

dcbnl.h

…

devlink.h

devlink: Introduce burst period for health reporter

2025-08-26 17:24:16 -07:00

dropreason-core.h

sched: Add enqueue/dequeue of dualpi2 qdisc

2025-07-23 17:52:07 -07:00

dropreason.h

…

dsa_stubs.h

…

dsa.h

net: dsa: tag_brcm: add support for legacy FCS tags

2025-06-17 17:52:01 -07:00

dscp.h

…

dsfield.h

…

dst_cache.h

…

dst_metadata.h

net: Add options as a flexible array to struct ip_tunnel_info

2025-02-20 13:17:16 -08: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: Create separate gro_flush_normal function

2025-07-24 18:34:55 -07:00

gso.h

…

gtp.h

…

gue.h

…

handshake.h

…

hotdata.h

net: introduce per netns packet chains

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

hwbm.h

…

icmp.h

…

ieee8021q.h

…

ieee80211_radiotap.h

…

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: Don't pass hashinfo to socket lookup helpers.

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

inet_common.h

…

inet_connection_sock.h

tcp: Remove sk->sk_prot->orphan_count.

2025-09-01 12:52:09 -07: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: Don't pass hashinfo to socket lookup helpers.

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

inet_sock.h

…

inet_timewait_sock.h

…

inetpeer.h

…

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

net: use dst_dev_rcu() in sk_setup_caps()

2025-08-29 19:36:32 -07: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

ipv4: Convert ->flowi4_tos to dscp_t.

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

ip_vs.h

ipvs: Fix estimator kthreads preferred affinity

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

ip.h

net: use dst_dev_rcu() in sk_setup_caps()

2025-08-29 19:36:32 -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

…

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: don't require cipher and keylen in gtk rekey

2025-07-22 10:43:19 +02:00

mac802154.h

…

macsec.h

…

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: Update pneigh_entry in pneigh_create().

2025-07-17 16:25:22 -07:00

net_debug.h

…

net_failover.h

…

net_namespace.h

net: Remove ->exit_batch_rtnl().

2025-04-14 17:08:45 -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

…

netlink.h

netlink: introduce type-checking attribute iteration for nlmsg

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

netmem.h

netmem, mlx4: access ->pp_ref_count through netmem_desc instead of page

2025-07-23 17:46:54 -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

…

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

…

pkt_sched.h

net/sched: sch_qfq: Fix null-deref in agg_dequeue

2025-07-10 11:08:35 +02:00

pptp.h

…

proto_memory.h

net-memcg: Pass struct sock to mem_cgroup_sk_under_memory_pressure().

2025-08-19 19:20:59 -07:00

protocol.h

…

psample.h

…

psnap.h

…

raw.h

inet: raw: add drop_counters to raw sockets

2025-08-28 13:14:50 +02:00

rawv6.h

…

red.h

…

regulatory.h

…

request_sock.h

tcp: remove inet_rtx_syn_ack()

2025-06-27 15:34:19 -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/sched: Fix backlog accounting in qdisc_dequeue_internal

2025-08-14 17:52:29 -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

…

snmp.h

percpu: use TYPEOF_UNQUAL() in variable declarations

2025-03-16 22:05:53 -07:00

sock_reuseport.h

…

sock.h

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

2025-09-04 13:33:00 -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_states.h

…

tcp.h

tcp: Remove sk->sk_prot->orphan_count.

2025-09-01 12:52:09 -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

…

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: add drop_counters to udp socket

2025-08-28 13:14:50 +02: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

xsk: Add launch time hardware offload support to XDP Tx metadata

2025-02-20 15:13:45 -08:00

xdp_sock.h

net: xsk: introduce XDP_MAX_TX_SKB_BUDGET setsockopt

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

xdp.h

xdp: create locked/unlocked instances of xdp redirect target setters

2025-04-22 19:57:56 -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