Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 17 Apr 2025 19:23:49 +0000 (12:23 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Apr 2025 19:26:50 +0000 (12:26 -0700)
commit240ce924d2718b8f6f622f2a9a9c219b9da736e8
treea417bc3d31264e2c317614b25c4a7a6f688916b5
parent22ab6b9467c1822291a1175a0eb825b7ec057ef9
parentb5c6891b2c5b54bf58069966296917da46cda6f2
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.15-rc3).

No conflicts. Adjacent changes:

tools/net/ynl/pyynl/ynl_gen_c.py
  4d07bbf2d456 ("tools: ynl-gen: don't declare loop iterator in place")
  7e8ba0c7de2b ("tools: ynl: don't use genlmsghdr in classic netlink")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
16 files changed:
Documentation/netlink/specs/rt-link.yaml
Documentation/netlink/specs/rt-neigh.yaml
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/intel/igc/igc_ptp.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
mm/page_alloc.c
net/core/dev.c
net/core/fib_rules.c
net/core/rtnetlink.c
net/ipv6/route.c
tools/net/ynl/pyynl/ynl_gen_c.py