From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthieu Baerts <matttbe@kernel.org>
Cc: Frank Li <Frank.Li@nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
imx@lists.linux.dev, Eric Dumazet <edumazet@google.com>,
Rob Herring <robh@kernel.org>, Conor Dooley <conor+dt@kernel.org>,
"open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Paolo Abeni <pabeni@redhat.com>
Subject: Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties: manual merge
Date: Thu, 15 Aug 2024 11:11:07 +1000 [thread overview]
Message-ID: <20240815111107.15bfbf93@canb.auug.org.au> (raw)
In-Reply-To: <6b5897e7-1bed-4eb3-8574-093db5dea159@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
Hi Matthieu,
On Wed, 14 Aug 2024 11:06:10 +0200 Matthieu Baerts <matttbe@kernel.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-08-15 1:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-11 18:40 [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties Frank Li
2024-08-12 9:22 ` Krzysztof Kozlowski
2024-08-14 1:20 ` patchwork-bot+netdevbpf
2024-08-14 9:06 ` [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties: manual merge Matthieu Baerts
2024-08-15 1:11 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240815111107.15bfbf93@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Frank.Li@nxp.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=imx@lists.linux.dev \
--cc=ioana.ciornei@nxp.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matttbe@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox