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

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the asm-generic tree got a conflict in:

  arch/cris/kernel/sys_cris.c

between commit:

  17b923b234ed ("mm: add ksys_mmap_pgoff() helper; remove in-kernel calls to sys_mmap_pgoff()")

from the syscalls tree and commit:

  77b0b77f7812 ("CRIS: Drop support for the CRIS port")

from the asm-generic 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: pgpggndWrJ4tq.pgp
Description: OpenPGP digital signature