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

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

Conflicts:

drivers/net/ethernet/cadence/macb_main.c
  fa52f15c745c ("net: cadence: macb: Synchronize stats calculations")
  75696dd0fd72 ("net: cadence: macb: Convert to get_stats64")
https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/intel/ice/ice_sriov.c
  79990cf5e7ad ("ice: Fix deinitializing VF in error path")
  a203163274a4 ("ice: simplify VF MSI-X managing")

net/ipv4/tcp.c
  18912c520674 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace")
  297d389e9e5b ("net: prefix devmem specific helpers")

net/mptcp/subflow.c
  8668860b0ad3 ("mptcp: reset when MPTCP opts are dropped after join")
  c3349a22c200 ("mptcp: consolidate subflow cleanup")

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

2025-02-27 10:20:58 -08:00

..

af_rds.c

net/rds: Fix UBSAN: array-index-out-of-bounds in rds_cmsg_recv

2024-01-22 11:24:00 +00:00

bind.c

treewide: use get_random_{u8,u16}() when possible, part 2

2022-10-11 17:42:58 -06:00

cong.c

…

connection.c

net: rds: Simplify the allocation of slab caches in rds_conn_init

2024-01-30 17:08:19 -08:00

ib_cm.c

…

ib_frmr.c

…

ib_mr.h

…

ib_rdma.c

net/rds: remove unused struct 'rds_ib_dereg_odp_mr'

2024-10-03 16:42:52 -07:00

ib_recv.c

net: add missing includes of linux/sched/clock.h

2023-01-27 11:19:46 +00:00

ib_ring.c

…

ib_send.c

…

ib_stats.c

…

ib_sysctl.c

net: rds: Remove the now superfluous sentinel elements from ctl_table array

2024-05-03 13:29:42 +01:00

ib.c

…

ib.h

RDS: IB: Remove unused declarations

2024-08-01 09:03:28 -07:00

info.c

…

info.h

…

Kconfig

net: rds: add option for GCOV profiling

2024-08-09 13:18:46 +01:00

loop.c

…

loop.h

…

Makefile

net: rds: add option for GCOV profiling

2024-08-09 13:18:46 +01:00

message.c

rds: rds_rm_zerocopy_callback() correct order for list_add_tail()

2023-02-13 09:33:39 +00:00

page.c

…

rdma_transport.c

net: rds: Fix possible NULL-pointer dereference

2023-09-20 08:49:03 +01:00

rdma_transport.h

net/rds: Remove unused function declarations

2023-08-13 12:25:42 +01:00

rdma.c

net/rds: fix possible cp null dereference

2024-03-29 12:04:09 -07:00

rds_single_path.h

…

rds.h

net/rds: Remove unused function declarations

2023-08-13 12:25:42 +01:00

recv.c

net:rds: Fix possible deadlock in rds_message_put

2024-02-13 10:25:30 +01:00

send.c

rds: introduce acquire/release ordering in acquire/release_in_xmit()

2024-03-19 12:15:35 +01:00

stats.c

net/rds: Replace deprecated strncpy() with strscpy_pad()

2025-02-21 15:51:26 -08:00

sysctl.c

net: rds: Remove the now superfluous sentinel elements from ctl_table array

2024-05-03 13:29:42 +01:00

tcp_connect.c

net: prevent address rewrite in kernel_bind()

2023-10-01 19:31:29 +01:00

tcp_listen.c

net: change proto and proto_ops accept type

2024-05-13 18:19:09 -06:00

tcp_recv.c

rds:Simplify the allocation of slab caches

2024-06-19 10:47:40 +01:00

tcp_send.c

rds: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage

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

tcp_stats.c

…

tcp.c

net: better track kernel sockets lifetime

2025-02-21 16:00:58 -08:00

tcp.h

net/rds: Remove unused function declarations

2023-08-13 12:25:42 +01:00

threads.c

…

transport.c

…