From: "Thomas Weißschuh" <thomas@t-8ch•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Shuah Khan <skhan@linuxfoundation•org>, Willy Tarreau <w@1wt•eu>,
"Paul E. McKenney" <paulmck@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: 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:41:18 +0200 [thread overview]
Message-ID: <28aeee7b-2de5-4f39-8eb5-3e3486eeed1b@t-8ch.de> (raw)
In-Reply-To: <20230817133053.76d9f850@canb.auug.org.au>
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.
Thomas
next prev parent reply other threads:[~2023-08-24 6:42 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 [this message]
2023-08-24 6:48 ` Willy Tarreau
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=28aeee7b-2de5-4f39-8eb5-3e3486eeed1b@t-8ch.de \
--to=thomas@t-8ch$(echo .)de \
--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=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