From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wei Liu <wei.liu@kernel.org>
Cc: Borislav Petkov <bp@suse.de>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Juergen Gross <jgross@suse.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Kelley <mikelley@microsoft.com>
Subject: Re: linux-next: manual merge of the hyperv tree with the tip tree
Date: Wed, 17 Mar 2021 08:07:44 +1100 [thread overview]
Message-ID: <20210317080744.33f5c6a9@canb.auug.org.au> (raw)
In-Reply-To: <20210316150554.32xtihkhvdkup3eq@liuwe-devbox-debian-v2>
[-- Attachment #1: Type: text/plain, Size: 826 bytes --]
Hi all,
On Tue, 16 Mar 2021 15:05:54 +0000 Wei Liu <wei.liu@kernel.org> wrote:
>
> > Right,
> >
> > so tglx and I took a quick look and came to the conclusion that it would
> > be best if you - provided it is not too much trouble - keep applying
> > this patch so that linux-next can get tested properly and we - Wei or I
> > - explain this merge conflict in our pull requests during the next merge
> > window and ask Linus to merge your patch ontop. This way we'll save us
> > the cross-tree merging dance.
>
> Totally agreed. :-)
>
> I've made a note to inform Linus about this in the next merge window.
No worries, I will keep applying the patch (my setup allows that to
happen automatically). Linus should apply it as a part of the merge
resolution (as do I).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-03-16 21:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 3:35 linux-next: manual merge of the hyperv tree with the tip tree Stephen Rothwell
2021-03-15 19:09 ` Michael Kelley
2021-03-16 15:02 ` Borislav Petkov
2021-03-16 15:05 ` Wei Liu
2021-03-16 21:07 ` Stephen Rothwell [this message]
2021-03-16 21:31 ` Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2021-06-21 10:01 Stephen Rothwell
2021-10-26 6:22 Stephen Rothwell
2021-10-26 8:27 ` Borislav Petkov
2021-10-28 10:39 ` Wei Liu
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=20210317080744.33f5c6a9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.