linux

mirror of https://github.com/torvalds/linux.git synced 2025-04-09 14:45:27 +00:00

History

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_netlink.c

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

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

af_netlink.h

netlink: terminate outstanding dump on socket close

2024-11-07 13:45:34 -08:00

diag.c

netlink: fix netlink_diag_dump() return value

2024-02-26 11:46:12 +00:00

genetlink.c

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