| Message ID | 20240815110934.56ae623a@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
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
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.