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: "Thomas Weißschuh" <linux@weissschuh•net>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: linux-next: duplicate patch in the nolibc tree
Date: Thu, 17 Aug 2023 13:38:11 +1000 [thread overview]
Message-ID: <20230817133811.0a73c624@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
Hi all,
The following commit is also in the vfs-brauner tree as a different commit
(but the same patch):
ba859b2e419c ("selftests/nolibc: drop test chmod_net")
This is commit
49319832de90 ("selftests/nolibc: drop test chmod_net")
in the vfs-brauner tree.
This duplication is causing a conflict.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-17 3:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 3:38 Stephen Rothwell [this message]
2023-08-17 16:30 ` linux-next: duplicate patch in the nolibc tree Thomas Weißschuh
2023-08-17 18:27 ` Shuah Khan
2023-08-17 18:46 ` Paul E. McKenney
2023-08-17 19:39 ` Willy Tarreau
2023-08-17 20:41 ` Paul E. McKenney
2023-08-18 13:27 ` Christian Brauner
2023-08-18 13:59 ` Shuah Khan
2023-08-21 15:52 ` Shuah Khan
2023-08-21 16:07 ` Christian Brauner
2023-08-22 9:50 ` Willy Tarreau
2023-08-17 19:34 ` Thomas Weißschuh
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=20230817133811.0a73c624@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(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