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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <6b5897e7-1bed-4eb3-8574-093db5dea159@kernel.org>
Date: Wed, 14 Aug 2024 11:06:10 +0200
From: Matthieu Baerts <matttbe@...nel.org>
To: Frank Li <Frank.Li@....com>, "David S. Miller" <davem@...emloft.net>,
 Jakub Kicinski <kuba@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>
Cc: imx@...ts.linux.dev, Eric Dumazet <edumazet@...gle.com>,
 Rob Herring <robh@...nel.org>, Conor Dooley <conor+dt@...nel.org>,
 "open list:NETWORKING DRIVERS" <netdev@...r.kernel.org>,
 "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
 <devicetree@...r.kernel.org>, open list <linux-kernel@...r.kernel.org>,
 Ioana Ciornei <ioana.ciornei@....com>, Paolo Abeni <pabeni@...hat.com>,
 Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using
 unevaluatedProperties: manual merge

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@...000000: 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.

View attachment "691930dfa066cc019020ee32efc7a795736dc1e6.patch" of type "text/x-patch" (526 bytes)