Subject: Re: linux-next: manual merge of the keys tree with the m86k tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 28 Jan 2020 07:52:14 +1100

Hi all,

On Mon, 13 Jan 2020 12:37:00 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> On Mon, 13 Jan 2020 12:36:03 +1100 Stephen Rothwell <[email-masked]> wrote:
> >
> > Today's linux-next merge of the keys tree got a conflict in:
> > 
> >   arch/m68k/kernel/syscalls/syscall.tbl
> > 
> > between commit:
> > 
> >   e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
> > 
> > from the m86k tree and commit:
> > 
> >   519c484a997a ("Add a general, global device notification watch list")
> > 
> > from the keys tree.
> > 
> > I fixed it up (see below) 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.  
> 
> Sorry, forgot the diff ...
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/m68k/kernel/syscalls/syscall.tbl
> index b911e0f50a71,83e4e8784b88..000000000000
> --- a/arch/m68k/kernel/syscalls/syscall.tbl
> +++ b/arch/m68k/kernel/syscalls/syscall.tbl
> @@@ -434,5 -434,5 +434,6 @@@
>   432	common	fsmount				sys_fsmount
>   433	common	fspick				sys_fspick
>   434	common	pidfd_open			sys_pidfd_open
>  -# 435 reserved for clone3
>  +435	common	clone3				__sys_clone3
> + 436	common	watch_devices			sys_watch_devices
>  +437	common	openat2				sys_openat2

This is now a conflict between the keys tree and Linus' tree - just a
reminder for pull requests.

-- 
Cheers,
Stephen Rothwell