linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/tile/kernel/pci_gx.c

between commit:

  0373506fe580 ("arch: remove tile port")

from the asm-generic tree and commit:

  4b36a05ab086 ("arch/tile/kernel/pci_gx.c: make setup_pcie_rc_delay() __init")

from the akpm-current 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: pgpqYBCj2xDoT.pgp
Description: OpenPGP digital signature