From: Shuah Khan <skhan@linuxfoundation•org>
To: "Christian Brauner" <brauner@kernel•org>,
"Thomas Weißschuh" <thomas@t-8ch•de>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>, Willy Tarreau <w@1wt•eu>,
"Paul E. McKenney" <paulmck@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Zhangjin Wu <falcon@tinylab•org>,
Shuah Khan <skhan@linuxfoundation•org>
Subject: Re: linux-next: manual merge of the nolibc tree with the vfs-brauner tree
Date: Thu, 24 Aug 2023 08:24:32 -0600 [thread overview]
Message-ID: <b7105474-bec9-f08b-b623-bf350909cab5@linuxfoundation.org> (raw)
In-Reply-To: <20230824-randfigur-emittenten-de303734445c@brauner>
On 8/24/23 02:52, Christian Brauner wrote:
>> Anyways Linus should also be able to resolve the conflict for v6.6 with
>> a small hint in the PR.
>
> Suprisingly, we've done this before. :)
Right. This is how resolve these types of merge conflicts. I will add
note to Linus about this one.
thanks,
-- Shuah
prev parent reply other threads:[~2023-08-24 14:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 4:10 linux-next: manual merge of the nolibc tree with the vfs-brauner tree Stephen Rothwell
2023-08-24 6:27 ` 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 [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=b7105474-bec9-f08b-b623-bf350909cab5@linuxfoundation.org \
--to=skhan@linuxfoundation$(echo .)org \
--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=paulmck@kernel$(echo .)org \
--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