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>

diff --cc Documentation/netlink/specs/devlink.yaml
Simple merge

diff --cc Documentation/netlink/specs/dpll.yaml
Simple merge

diff --cc Documentation/netlink/specs/ethtool.yaml
Simple merge

diff --cc Documentation/netlink/specs/fou.yaml
index 46b1fb38ec503481d7af7148b9521cd266754a63,b02ab19817d3c3148b9f6e9f6928e1cbd7307301..57735726262ec36b2ca75482388115a6eed2b2fd
--- 1/Documentation/netlink/specs/fou.yaml
--- 2/Documentation/netlink/specs/fou.yaml
+++ b/Documentation/netlink/specs/fou.yaml
@@@ -15,10 -15,10 +15,10 @@@ kernel-policy: globa
  definitions:
    -
      type: enum
-     name: encap_type
+     name: encap-type
      name-prefix: fou-encap-
      enum-name:
 -    entries: [ unspec, direct, gue ]
 +    entries: [unspec, direct, gue]
  
  attribute-sets:
    -

diff --cc Documentation/netlink/specs/mptcp_pm.yaml
index bc395963e628da7a996aa88fba15cba10acce48a,fb57860fe778c6746c1779a73c3272297918758f..02f1ddcfbf1cfd81a398dd03c52bb9f281c1aa08
--- 1/Documentation/netlink/specs/mptcp_pm.yaml
--- 2/Documentation/netlink/specs/mptcp_pm.yaml
+++ b/Documentation/netlink/specs/mptcp_pm.yaml
@@@ -17,72 -17,72 +17,72 @@@ definitions
      enum-name: mptcp-event-type
      name-prefix: mptcp-event-
      entries:
 -     -
 -      name: unspec
 -      doc: unused event
 -     -
 -      name: created
 -      doc: >-
 -        A new MPTCP connection has been created. It is the good time to
 -        allocate memory and send ADD_ADDR if needed. Depending on the
 -        traffic-patterns it can take a long time until the
 -        MPTCP_EVENT_ESTABLISHED is sent.
 -        Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
 -        dport, server-side.
 -     -
 -      name: established
 -      doc: >-
 -        A MPTCP connection is established (can start new subflows).
 -        Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
 -        dport, server-side.
 -     -
 -      name: closed
 -      doc: >-
 -        A MPTCP connection has stopped.
 -        Attribute: token.
 -     -
 -      name: announced
 -      value: 6
 -      doc: >-
 -        A new address has been announced by the peer.
 -        Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].
 -     -
 -      name: removed
 -      doc: >-
 -        An address has been lost by the peer.
 -        Attributes: token, rem_id.
 -     -
 -      name: sub-established
 -      value: 10
 -      doc: >-
 -        A new subflow has been established. 'error' should not be set.
 -        Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
 -        daddr6, sport, dport, backup, if-idx [, error].
 -     -
 -      name: sub-closed
 -      doc: >-
 -        A subflow has been closed. An error (copy of sk_err) could be set if an
 -        error has been detected for this subflow.
 -        Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
 -        daddr6, sport, dport, backup, if-idx [, error].
 -     -
 -      name: sub-priority
 -      value: 13
 -      doc: >-
 -        The priority of a subflow has changed. 'error' should not be set.
 -        Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
 -        daddr6, sport, dport, backup, if-idx [, error].
 -     -
 -      name: listener-created
 -      value: 15
 -      doc: >-
 -        A new PM listener is created.
 -        Attributes: family, sport, saddr4 | saddr6.
 -     -
 -      name: listener-closed
 -      doc: >-
 -        A PM listener is closed.
 -        Attributes: family, sport, saddr4 | saddr6.
 +      -
 +        name: unspec
 +        doc: unused event
 +      -
 +        name: created
 +        doc: >-
 +          A new MPTCP connection has been created. It is the good time to
 +          allocate memory and send ADD_ADDR if needed. Depending on the
 +          traffic-patterns it can take a long time until the
 +          MPTCP_EVENT_ESTABLISHED is sent.
 +          Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
 +          dport, server-side.
 +      -
 +        name: established
 +        doc: >-
 +          A MPTCP connection is established (can start new subflows).
 +          Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
 +          dport, server-side.
 +      -
 +        name: closed
 +        doc: >-
 +          A MPTCP connection has stopped.
 +          Attribute: token.
 +      -
 +        name: announced
 +        value: 6
 +        doc: >-
 +          A new address has been announced by the peer.
 +          Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].
 +      -
 +        name: removed
 +        doc: >-
 +          An address has been lost by the peer.
 +          Attributes: token, rem_id.
 +      -
 +        name: sub-established
 +        value: 10
 +        doc: >-
 +          A new subflow has been established. 'error' should not be set.
 +          Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
-           daddr6, sport, dport, backup, if_idx [, error].
++          daddr6, sport, dport, backup, if-idx [, error].
 +      -
 +        name: sub-closed
 +        doc: >-
 +          A subflow has been closed. An error (copy of sk_err) could be set if
 +          an error has been detected for this subflow.
 +          Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
-           daddr6, sport, dport, backup, if_idx [, error].
++          daddr6, sport, dport, backup, if-idx [, error].
 +      -
 +        name: sub-priority
 +        value: 13
 +        doc: >-
 +          The priority of a subflow has changed. 'error' should not be set.
 +          Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
-           daddr6, sport, dport, backup, if_idx [, error].
++          daddr6, sport, dport, backup, if-idx [, error].
 +      -
 +        name: listener-created
 +        value: 15
 +        doc: >-
 +          A new PM listener is created.
 +          Attributes: family, sport, saddr4 | saddr6.
 +      -
 +        name: listener-closed
 +        doc: >-
 +          A PM listener is closed.
 +          Attributes: family, sport, saddr4 | saddr6.
  
  attribute-sets:
    -

diff --cc Documentation/netlink/specs/nfsd.yaml
Simple merge

diff --cc Documentation/netlink/specs/ovs_flow.yaml
Simple merge

diff --cc Documentation/netlink/specs/rt-link.yaml
Simple merge

diff --cc Documentation/netlink/specs/tc.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/enetc_hw.h
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
Simple merge

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge