Hi Matthieu,
On Wed, 14 Aug 2024 11:06:10 +0200 Matthieu Baerts <matttbe@xxxxxxxxxx> 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:
pgp_sr7o7yUhq.pgp
Description: OpenPGP digital signature
