From: Willy Tarreau <w@1wt•eu>
To: "Thomas Weißschuh" <thomas@t-8ch•de>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Shuah Khan <skhan@linuxfoundation•org>,
"Paul E. McKenney" <paulmck@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Ryan Roberts <ryan.roberts@arm•com>
Subject: Re: linux-next: manual merge of the nolibc tree with the mm-stable tree
Date: Thu, 24 Aug 2023 08:48:26 +0200 [thread overview]
Message-ID: <ZOb9OuFh/2pmkRv+@1wt.eu> (raw)
In-Reply-To: <28aeee7b-2de5-4f39-8eb5-3e3486eeed1b@t-8ch.de>
Hi Thomas,
On Thu, Aug 24, 2023 at 08:41:18AM +0200, Thomas Weißschuh wrote:
> Hi everybody,
>
> On 2023-08-17 13:30:53+1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the nolibc tree got a conflict in:
> >
> > tools/include/nolibc/stdio.h
> >
> > between commit:
> >
> > 08d959738a95 ("selftests: line buffer test program's stdout")
> >
> > from the mm-stable tree and commits:
> >
> > 65ff4d19f792 ("tools/nolibc/stdio: add setvbuf() to set buffering mode")
> > 2e00a8fc4f47 ("tools/nolibc: setvbuf: avoid unused parameter warnings")
> >
> > from the nolibc tree.
> >
> > I fixed it up (I just used the latter version of this file) 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.
>
> how do we want to handle this one?
>
> A small note to Linus in the PRs to him on how to resolve it seem
> reasonable to me.
> But I'm fairly new to the process.
My understanding is that Stephen's fix is still in his tree. We may indeed
need to add a note to Linus in the PR about this one and the other one.
Cheers,
Willy
next prev parent reply other threads:[~2023-08-24 6:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 3:30 linux-next: manual merge of the nolibc tree with the mm-stable tree Stephen Rothwell
2023-08-24 6:41 ` Thomas Weißschuh
2023-08-24 6:48 ` Willy Tarreau [this message]
2023-08-24 11:45 ` Paul E. McKenney
2023-08-24 14:23 ` 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=ZOb9OuFh/2pmkRv+@1wt.eu \
--to=w@1wt$(echo .)eu \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@kernel$(echo .)org \
--cc=ryan.roberts@arm$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=thomas@t-8ch$(echo .)de \
/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