Hi James,
Today's linux-next merge of the metag tree got a conflict in:
arch/metag/kernel/sys_metag.c
between commits:
fabbf34a610d ("mm: add ksys_fadvise64_64() helper; remove in-kernel call to sys_fadvise64_64()")
a302a8524798 ("mm: add ksys_mmap_pgoff() helper; remove in-kernel calls to sys_mmap_pgoff()")
9608ec858cdd ("fs: add ksys_sync_file_range helper(); remove in-kernel calls to syscall")
from the syscalls tree and commit:
bb6fb6dfcc17 ("metag: Remove arch/metag/")
from the metag 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:
pgpZo6em9uQwo.pgp
Description: OpenPGP digital signature
