Linux-Next Archive on
 help / color / Atom feed
* linux-next: manual merge of the sh tree with the csky tree
@ 2020-07-28  0:18 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-07-28  0:18 UTC (permalink / raw)
  To: Rich Felker, Guo Ren
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Michael Karcher

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

Hi all,

Today's linux-next merge of the sh tree got a conflict in:


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.

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;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28  0:18 linux-next: manual merge of the sh tree with the csky tree Stephen Rothwell

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone