Subject: Re: linux-next: manual merge of the sh tree with the csky tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 Aug 2020 08:39:49 +1000

Hi all,

On Tue, 28 Jul 2020 10:18:46 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the sh tree got a conflict in:
> 
>   tools/testing/selftests/seccomp/seccomp_bpf.c
> 
> between commit:
> 
>   f4dd2edafba0 ("csky: add support for SECCOMP and SECCOMP_FILTER")
> 
> from the csky tree and commit:
> 
>   469023465e79 ("sh: Add SECCOMP_FILTER")
> 
> from the sh 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.
> 
> diff --cc tools/testing/selftests/seccomp/seccomp_bpf.c
> index 8d18a0ddafdd,6eb21685c88f..000000000000
> --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
> +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
> @@@ -1703,8 -1699,7 +1709,8 @@@ void change_syscall(struct __test_metad
>   	EXPECT_EQ(0, ret) {}
>   
>   #if defined(__x86_64__) || defined(__i386__) || defined(__powerpc__) || \
>  -	defined(__s390__) || defined(__hppa__) || defined(__riscv) || defined(__sh__)
>  +	defined(__s390__) || defined(__hppa__) || defined(__riscv) || \
> - 	defined(__csky__)
> ++	defined(__csky__) || defined(__sh__)
>   	{
>   		regs.SYSCALL_NUM = syscall;
>   	}

This is now a conflict between the sh tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell