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

..

af_smc.c

net/smc: Do not re-initialize smc hashtables

2026-05-22 17:38:02 -07:00

Kconfig

net: smc: SMC_HS_CTRL_BPF should depend on BPF_JIT

2025-12-04 11:07:18 -08:00

Makefile

net/smc: bpf: Introduce generic hook for handshake flow

2025-11-10 11:19:41 -08:00

smc_cdc.c

net/smc: adapt cursor update when sndbuf and peer DMB are merged

2024-04-30 13:24:48 +02:00

smc_cdc.h

net/smc: fix kernel panic caused by race of smc_sock

2021-12-28 12:42:45 +00:00

smc_clc.c

net/smc: avoid early lgr access in smc_clc_wait_msg

2026-04-23 11:00:57 -07:00

smc_clc.h

net/smc: check smcd_v2_ext_offset when receiving proposal msg

2024-12-15 12:34:59 +00:00

smc_close.c

net/smc: fix NULL dereference and UAF in smc_tcp_syn_recv_sock()

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

smc_close.h

…

smc_core.c

net/smc: cap allocation order for SMC-R physically contiguous buffers

2026-04-30 17:33:11 -07:00

smc_core.h

net/smc: handle -ENOMEM from smc_wr_alloc_link_mem gracefully

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

smc_diag.c

dibs: Local gid for dibs devices

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

smc_hs_bpf.c

net/smc: bpf: Introduce generic hook for handshake flow

2025-11-10 11:19:41 -08:00

smc_hs_bpf.h

net/smc: bpf: Introduce generic hook for handshake flow

2025-11-10 11:19:41 -08:00

smc_ib.c

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

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

smc_ib.h

net/smc: fix smc clc failed issue when netdevice not in init_net

2023-10-13 16:52:02 -07:00

smc_inet.c

net/smc: fix general protection fault in __smc_diag_dump

2025-10-20 17:46:06 -07:00

smc_inet.h

net/smc: Introduce IPPROTO_SMC

2024-06-17 13:14:09 +01:00

smc_ism.c

smc: Use flexible array for SMCD connections

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

smc_ism.h

dibs: Move data path to dibs layer

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

smc_llc.c

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

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

smc_llc.h

net/smc: Introduce a specific sysctl for TEST_LINK time

2022-09-22 12:58:21 +02:00

smc_netlink.c

genetlink: start to validate reserved header bytes

2022-08-29 12:47:15 +01:00

smc_netlink.h

net/smc: add support for user defined EIDs

2021-09-14 12:49:10 +01:00

smc_netns.h

net/smc: introduce list of pnetids for Ethernet devices

2020-09-28 15:19:03 -07:00

smc_pnet.c

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

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

smc_pnet.h

net/smc: Use a mutex for locking "struct smc_pnettable"

2022-02-24 09:09:33 -08:00

smc_rx.c

net/smc: fix double-free of smc_spd_priv when tee() duplicates splice pipe buffer

2026-03-20 18:59:30 -07:00

smc_rx.h

net/smc: fix data error when recvmsg with MSG_PEEK flag

2025-01-13 18:59:00 -08:00

smc_stats.c

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

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

smc_stats.h

net/smc: introduce statistics for ringbufs usage of net namespace

2024-08-20 11:38:23 +02:00

smc_sysctl.c

net/smc: bpf: Introduce generic hook for handshake flow

2025-11-10 11:19:41 -08:00

smc_sysctl.h

net/smc: make wr buffer count configurable

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

smc_tracepoint.c

net/smc: Introduce tracepoint for smcr link down

2021-11-01 13:39:14 +00:00

smc_tracepoint.h

net/smc: avoid NULL deref of conn->lnk in smc_msg_event tracepoint

2026-05-12 18:44:36 -07:00

smc_tx.c

net/smc: Decouple sf and attached send_buf in smc_loopback

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

smc_tx.h

smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGES

2023-06-24 15:50:12 -07:00

smc_wr.c

Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses

2026-02-22 08:26:33 -08:00

smc_wr.h

net/smc: make wr buffer count configurable

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

smc.h

net/smc: fix NULL dereference and UAF in smc_tcp_syn_recv_sock()

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