From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rich Felker <dalias@libc.org>, Guo Ren <ren_guo@c-sky.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Subject: linux-next: manual merge of the sh tree with the csky tree
Date: Tue, 28 Jul 2020 10:18:46 +1000 [thread overview]
Message-ID: <20200728101846.73cf063c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
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;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-28 0:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 0:18 Stephen Rothwell [this message]
2020-08-09 22:39 ` linux-next: manual merge of the sh tree with the csky tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728101846.73cf063c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dalias@libc.org \
--cc=kernel@mkarcher.dialup.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ren_guo@c-sky.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).