Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties: manual merge

[Matthieu Baerts <matttbe@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]

Hi Frank,

On 11/08/2024 20:40, Frank Li wrote:
> Replace additionalProperties with unevaluatedProperties because it have
> allOf: $ref: ethernet-controller.yaml#.
> 
> Remove all properties, which already defined in ethernet-controller.yaml.
> 
> Fixed below CHECK_DTBS warnings:
> arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dtb:
>    fsl-mc@80c000000: dpmacs:ethernet@11: 'fixed-link' does not match any of the regexes: 'pinctrl-[0-9]+'
>         from schema $id: http://devicetree.org/schemas/misc/fsl,qoriq-mc.yaml#

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

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

and this one from 'net-next':

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

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Regarding this conflict, a merge of the two modifications has been
taken: adding 'phys', and removing 'managed'

Rerere cache is available in [2].

Cheers,
Matt

1: https://github.com/multipath-tcp/mptcp_net-next/commit/691930dfa066
2: https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/d15f8

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

[-- Attachment #2: 691930dfa066cc019020ee32efc7a795736dc1e6.patch --]
[-- Type: text/x-patch, Size: 526 bytes --]

diff --cc Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
index 42f9843d1868,f19c4fa66f18..be8a2163b73e
--- 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