linux-next: manual merge of the arm-soc tree with the dma-mapping tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in:

  arch/arm/mach-imx/mach-mx31moboard.c

between commit:

  f47e22d65d08 ("dma-mapping: split <linux/dma-mapping.h>")

from the dma-mapping tree and commit:

  c93197b0041d ("ARM: imx: Remove i.MX31 board files")

from the arm-soc tree.

I fixed it up (I just removed the 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: pgppdOmQljNTs.pgp
Description: OpenPGP digital signature