linux-next: manual merge of the mips-james tree with the mips-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the mips-james tree got a conflict in:

  arch/mips/boot/dts/xilfpga/Makefile

between commit:

  a5a92abbce56 ("MIPS: xilfpga: Stop generating useless dtb.o")

from the mips-fixes tree and commit:

  fca3aa166422 ("MIPS: dts: Avoid unneeded built-in.a in DTS dirs")

from the mips-james tree.

I fixed it up (I just used the former update to this file) 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: pgpaTYCo8z2dy.pgp
Description: OpenPGP digital signature