From: Shuah Khan <skhan@linuxfoundation•org>
To: paulmck@kernel•org, Willy Tarreau <w@1wt•eu>
Cc: "Thomas Weißschuh" <thomas@t-8ch•de>,
"Stephen Rothwell" <sfr@canb•auug.org.au>,
"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>,
"Shuah Khan" <skhan@linuxfoundation•org>
Subject: Re: linux-next: manual merge of the nolibc tree with the mm-stable tree
Date: Thu, 24 Aug 2023 08:23:53 -0600 [thread overview]
Message-ID: <4328e2ca-7cec-4043-6c4f-e6a8a37c1b0f@linuxfoundation.org> (raw)
In-Reply-To: <18989954-981e-46bb-a60b-973c1c58fd86@paulmck-laptop>
On 8/24/23 05:45, Paul E. McKenney wrote:
> On Thu, Aug 24, 2023 at 08:48:26AM +0200, Willy Tarreau wrote:
>> 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.
>
> Yes, this is the usual approach. The note to Linus normally includes the
> URL for Stephen's email. I usually also do the merge myself, publish
> a branch to it, and include the name of that branch in my pull request
> to Linus. Linus usually prefers to resolve the merge conflicts himself,
> but my merge gives him something to compare against.
>
Right. This is how resolve these types of merge conflicts. I will add
note to Linus about this one and the other one with vfs.
thanks,
-- Shuah
prev parent reply other threads:[~2023-08-24 14:24 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
2023-08-24 11:45 ` Paul E. McKenney
2023-08-24 14:23 ` Shuah Khan [this message]
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=4328e2ca-7cec-4043-6c4f-e6a8a37c1b0f@linuxfoundation.org \
--to=skhan@linuxfoundation$(echo .)org \
--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=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