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

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

Conflicts:

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
  f67aead16e ("net: txgbe: rework service event handling")
  57d39faed4 ("net: txgbe: improve functions of AML 40G devices")

net/rds/info.c
  512db8267b ("rds: mark snapshot pages dirty in rds_info_getsockopt()")
  6e94eeb2a2 ("rds: convert to getsockopt_iter")

Adjacent changes:

include/net/sock.h
  1ee90b77b7 ("net: guard timestamp cmsgs to real error queue skbs")
  f0de88303d ("net: make is_skb_wmem() available to modules")

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

2026-06-11 14:33:35 -07:00

..

cq.h

…

device.h

…

doorbell.h

…

driver.h

net/mlx5: Add SPF function type for page management

2026-05-25 13:48:51 -07:00

eq.h

…

eswitch.h

net/mlx5: E-Switch, serialize representor lifecycle

2026-05-06 19:03:37 -07:00

fs_helpers.h

…

fs.h

…

lag.h

…

macsec.h

…

mlx5_ifc_fpga.h

…

mlx5_ifc_vdpa.h

…

mlx5_ifc.h

net/mlx5: Add sd_group_size bits for SD management

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

mpfs.h

…

port.h

…

qp.h

…

rsc_dump.h

…

transobj.h

…

vport.h

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

2026-06-11 14:33:35 -07:00