linux/drivers/infiniband/ulp
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
..
ipoib net: change ndo_set_rx_mode_async return type to int 2026-06-09 18:15:29 -07:00
iser Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
isert IB/isert: Reject login PDUs shorter than ISER_HEADERS_LEN 2026-06-08 13:43:23 -03:00
rtrs RDMA/rtrs: Fix use-after-free in path file creation cleanup 2026-05-19 19:32:48 -03:00
srp RDMA/srp: bound SRP_RSP sense copy by the received length 2026-06-08 13:43:23 -03:00
srpt scsi: target: Use driver completion preference by default 2026-02-28 21:04:02 -05:00
Makefile RDMA/hfi1: Remove opa_vnic 2026-03-10 07:51:30 -04:00