Messages in this thread | | | Date | Mon, 19 Jul 2021 09:51:50 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the aspeed tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the aspeed tree got a conflict in:
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
between commit:
faffd1b2bde3 ("ARM: dts: everest: Add phase corrections for eMMC")
from Linus' tree and commit:
315cc563d047 ("ARM: dts: everest: Add phase corrections for eMMC")
from the aspeed tree.
I fixed it up (I used the latter 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 [unhandled content-type:application/pgp-signature] | |