linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  Documentation/netlink/specs/mptcp_pm.yaml

between commit:

  9e6dd4c256d0 ("netlink: specs: mptcp: replace underscores with dashes in names")

from the net tree and commit:

  ec362192aa9e ("netlink: specs: fix up indentation errors")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/netlink/specs/mptcp_pm.yaml
index fb57860fe778,bc395963e628..000000000000
--- a/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:
    -

Attachment: pgpzt9lhKBv6v.pgp
Description: OpenPGP digital signature