From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Shuah Khan" <skhan@linuxfoundation•org>,
"Willy Tarreau" <w@1wt•eu>, "Thomas Weißschuh" <thomas@t-8ch•de>,
"Paul E. McKenney" <paulmck@kernel•org>,
"Christian Brauner" <brauner@kernel•org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Thomas Weißschuh" <linux@weissschuh•net>,
"Zhangjin Wu" <falcon@tinylab•org>
Subject: linux-next: manual merge of the nolibc tree with the vfs-brauner tree
Date: Thu, 24 Aug 2023 14:10:08 +1000 [thread overview]
Message-ID: <20230824141008.27f7270b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2335 bytes --]
Hi all,
Today's linux-next merge of the nolibc tree got a conflict in:
tools/testing/selftests/nolibc/nolibc-test.c
between commit:
49319832de90 ("selftests/nolibc: drop test chmod_net")
from the vfs-brauner tree and commit:
148e9718e2a2 ("selftests/nolibc: add chmod_argv0 test")
from the nolibc 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/nolibc/nolibc-test.c
index 970df9e55131,e2b70641a1e7..000000000000
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@@ -572,11 -857,14 +857,13 @@@ int run_syscall(int min, int max
CASE_TEST(kill_0); EXPECT_SYSZR(1, kill(getpid(), 0)); break;
CASE_TEST(kill_CONT); EXPECT_SYSZR(1, kill(getpid(), 0)); break;
CASE_TEST(kill_BADPID); EXPECT_SYSER(1, kill(INT_MAX, 0), -1, ESRCH); break;
+ CASE_TEST(sbrk_0); EXPECT_PTRNE(1, sbrk(0), (void *)-1); break;
CASE_TEST(sbrk); if ((p1 = p2 = sbrk(4096)) != (void *)-1) p2 = sbrk(-4096); EXPECT_SYSZR(1, (p2 == (void *)-1) || p2 == p1); break;
CASE_TEST(brk); EXPECT_SYSZR(1, brk(sbrk(0))); break;
- CASE_TEST(chdir_root); EXPECT_SYSZR(1, chdir("/")); break;
+ CASE_TEST(chdir_root); EXPECT_SYSZR(1, chdir("/")); chdir(getenv("PWD")); break;
CASE_TEST(chdir_dot); EXPECT_SYSZR(1, chdir(".")); break;
CASE_TEST(chdir_blah); EXPECT_SYSER(1, chdir("/blah"), -1, ENOENT); break;
+ CASE_TEST(chmod_argv0); EXPECT_SYSZR(1, chmod(argv0, 0555)); break;
- CASE_TEST(chmod_net); EXPECT_SYSZR(proc, chmod("/proc/self/net", 0555)); break;
CASE_TEST(chmod_self); EXPECT_SYSER(proc, chmod("/proc/self", 0555), -1, EPERM); break;
CASE_TEST(chown_self); EXPECT_SYSER(proc, chown("/proc/self", 0, 0), -1, EPERM); break;
CASE_TEST(chroot_root); EXPECT_SYSZR(euid0, chroot("/")); break;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-24 4:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 4:10 Stephen Rothwell [this message]
2023-08-24 6:27 ` linux-next: manual merge of the nolibc tree with the vfs-brauner tree Thomas Weißschuh
2023-08-24 6:40 ` Willy Tarreau
2023-08-24 7:36 ` Christian Brauner
2023-08-24 8:33 ` Thomas Weißschuh
2023-08-24 8:52 ` Christian Brauner
2023-08-24 14:24 ` Shuah Khan
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=20230824141008.27f7270b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=falcon@tinylab$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@weissschuh$(echo .)net \
--cc=paulmck@kernel$(echo .)org \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=thomas@t-8ch$(echo .)de \
--cc=w@1wt$(echo .)eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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