Commit 28aa52b6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR (net-6.16-rc4).

Conflicts:

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



Adjacent changes:

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5cfb2ac2 e34a79b9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment