]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 Jun 2025 17:08:24 +0000 (10:08 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 26 Jun 2025 17:40:50 +0000 (10:40 -0700)
commit28aa52b6189f1cc409f96910c63fa1b99370b99e
treee0beb1a538225a69132c267b76665b47e4c17bc1
parent5cfb2ac2806c7a255df5184d86ffca056cd5cb5c
parente34a79b96ab9d49ed8b605fee11099cf3efbb428
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.16-rc4).

Conflicts:

Documentation/netlink/specs/mptcp_pm.yaml
  9e6dd4c256d0 ("netlink: specs: mptcp: replace underscores with dashes in names")
  ec362192aa9e ("netlink: specs: fix up indentation errors")
https://lore.kernel.org/20250626122205.389c2cd4@canb.auug.org.au

Adjacent changes:

Documentation/netlink/specs/fou.yaml
  791a9ed0a40d ("netlink: specs: fou: replace underscores with dashes in names")
  880d43ca9aa4 ("netlink: specs: clean up spaces in brackets")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
16 files changed:
Documentation/netlink/specs/devlink.yaml
Documentation/netlink/specs/dpll.yaml
Documentation/netlink/specs/ethtool.yaml
Documentation/netlink/specs/fou.yaml
Documentation/netlink/specs/mptcp_pm.yaml
Documentation/netlink/specs/nfsd.yaml
Documentation/netlink/specs/ovs_flow.yaml
Documentation/netlink/specs/rt-link.yaml
Documentation/netlink/specs/tc.yaml
MAINTAINERS
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/freescale/enetc/enetc_hw.h
drivers/net/ethernet/microsoft/mana/gdma_main.c
net/core/netpoll.c
net/mac80211/util.c
net/unix/af_unix.c