On Wed, Mar 14, 2018 at 09:24:35AM +1100, Stephen Rothwell wrote:
> 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.
Stephen, James,
to follow up on this, I have dropped the changes to arch/metag/; that code
will continue to build and work (for the time being, at least) with or
without the patches specified above.
Thanks,
Dominik
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
