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

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

No conflicts, adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
  cc199cd1b9 ("net/mlx5e: Reduce branches in napi poll")
  c326f9c689 ("net/mlx5e: xsk: Fix unlocked writing to ICOSQ")

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
  c6df9a65cb ("net/mlx5: Skip disabled vports when setting max TX speed")
  1fba57c914 ("net/mlx5: Add VHCA_ID page management mode support")

net/mac80211/mlme.c
  a6e6ccd5bd ("wifi: mac80211: consume only present negotiated TTLM maps")
  49e62ec6eb ("wifi: mac80211: move frame RX handling to type files")

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

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

..

bind.c

treewide: Replace kmalloc with kmalloc_obj for non-scalar types

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

bind.h

ovpn: introduce the ovpn_peer object

2025-04-17 12:30:02 +02:00

crypto_aead.c

ovpn: consolidate crypto allocations in one chunk

2026-03-17 11:09:20 +01:00

crypto_aead.h

ovpn: implement key add/get/del/swap via netlink

2025-04-17 12:30:03 +02:00

crypto.c

ovpn: kill key and notify userspace in case of IV exhaustion

2025-04-17 12:30:03 +02:00

crypto.h

ovpn: kill key and notify userspace in case of IV exhaustion

2025-04-17 12:30:03 +02:00

io.c

ovpn: disable BHs when updating device stats

2026-05-15 00:43:55 +02:00

io.h

ovpn: implement keepalive mechanism

2025-04-17 12:30:03 +02:00

main.c

ovpn: fix race between deleting interface and adding new peer

2026-05-14 16:24:45 +02:00

main.h

…

Makefile

ovpn: implement TCP transport

2025-04-17 12:30:03 +02:00

netlink-gen.c

ovpn: add support for asymmetric peer IDs

2026-03-17 11:09:05 +01:00

netlink-gen.h

ovpn: add support for asymmetric peer IDs

2026-03-17 11:09:05 +01:00

netlink.c

ovpn: respect peer refcount in CMD_NEW_PEER error path

2026-05-14 16:24:45 +02:00

netlink.h

ovpn: notify userspace on client float event

2026-03-17 11:08:55 +01:00

ovpnpriv.h

ovpn: implement keepalive mechanism

2025-04-17 12:30:03 +02:00

peer.c

ovpn: fix race between deleting interface and adding new peer

2026-05-14 16:24:45 +02:00

peer.h

ovpn: respect peer refcount in CMD_NEW_PEER error path

2026-05-14 16:24:45 +02:00

pktid.c

ovpn: pktid: use bitops.h API

2026-03-17 11:08:54 +01:00

pktid.h

ovpn: pktid: use bitops.h API

2026-03-17 11:08:54 +01:00

proto.h

ovpn: implement packet processing

2025-04-17 12:30:02 +02:00

skb.h

ovpn: consolidate crypto allocations in one chunk

2026-03-17 11:09:20 +01:00

socket.c

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

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

socket.h

ovpn: ensure sk is still valid during cleanup

2025-06-03 13:08:15 +02:00

stats.c

ovpn: store tunnel and transport statistics

2025-04-17 12:30:02 +02:00

stats.h

ovpn: disable BHs when updating device stats

2026-05-15 00:43:55 +02:00

tcp.c

ovpn: disable BHs when updating device stats

2026-05-15 00:43:55 +02:00

tcp.h

ovpn: ensure sk is still valid during cleanup

2025-06-03 13:08:15 +02:00

udp.c

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

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

udp.h

ovpn: ensure sk is still valid during cleanup

2025-06-03 13:08:15 +02:00