[v1] linux-next: manual merge of the net-next tree with the net tree

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

Stephen Rothwell posted 1 patch 1 year, 5 months ago

Diff against v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1 v1
Download mbox

There is a newer version of this series

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

Posted by Stephen Rothwell 1 year, 5 months ago

Hi all,

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

  Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml

between commit:

  c25504a0ba36 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys")

from the net tree and commit:

  be034ee6c33d ("dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties")

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/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
index 42f9843d1868,f19c4fa66f18..000000000000
--- a/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
@@@ -36,12 -30,6 +30,10 @@@ properties
        A reference to a node representing a PCS PHY device found on
        the internal MDIO bus.
  
-   managed: true
- 
 +  phys:
 +    description: A reference to the SerDes lane(s)
 +    maxItems: 1
 +
  required:
    - reg