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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200728101846.73cf063c@canb.auug.org.au>
Date:   Tue, 28 Jul 2020 10:18:46 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rich Felker <dalias@...c.org>, Guo Ren <ren_guo@...ky.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Michael Karcher <kernel@...rcher.dialup.fu-berlin.de>
Subject: linux-next: manual merge of the sh tree with the csky tree

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

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;
  	}

Content of type "application/pgp-signature" skipped