netdev - 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] [day] [month] [year] [list]

Message-ID: <20240815111107.15bfbf93@canb.auug.org.au>
Date: Thu, 15 Aug 2024 11:11:07 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Matthieu Baerts <matttbe@...nel.org>
Cc: Frank Li <Frank.Li@....com>, "David S. Miller" <davem@...emloft.net>,
 Jakub Kicinski <kuba@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
 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>
Subject: Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using
 unevaluatedProperties: manual merge

Hi Matthieu,

On Wed, 14 Aug 2024 11:06:10 +0200 Matthieu Baerts <matttbe@...nel.org> wrote:
>
> 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")
>
> Regarding this conflict, a merge of the two modifications has been
> taken: adding 'phys', and removing 'managed'

Thanks for the heads up.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped