linux-next: manual merge of the dt-krzk tree with the aspeed tree

[Stephen Rothwell]

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: pgpnTv4P_IP7T.pgp
Description: OpenPGP digital signature