* linux-next: manual merge of the dt-krzk tree with the aspeed tree
@ 2024-04-04 0:28 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-04-04 0:28 UTC (permalink / raw)
To: Krzysztof Kozlowski, Joel Stanley
Cc: Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List, Yang Chen
[-- Attachment #1: Type: text/plain, Size: 885 bytes --]
Hi all,
Today's linux-next merge of the dt-krzk tree got a conflict in:
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
between commits:
4afd304e4e36 ("ARM: dts: aspeed: minerva: Revise the name of DTS")
6241b65454c7 ("ARM: dts: aspeed: minerva: Modify mac3 setting")
from the aspeed tree and commit:
e515719c17be ("ARM: dts: aspeed: minerva-cmc: correct Mellanox multi-host property")
from the dt-krzk tree.
I fixed it up (I just used the former version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-04 0:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-04 0:28 linux-next: manual merge of the dt-krzk tree with the aspeed tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).