From: Borislav Petkov <bp@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wei Liu <wei.liu@kernel.org>,
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: Tue, 16 Mar 2021 16:02:54 +0100 [thread overview]
Message-ID: <20210316150254.GC18822@zn.tnic> (raw)
In-Reply-To: <20210315143505.35af617b@canb.auug.org.au>
On Mon, Mar 15, 2021 at 02:35:05PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the hyperv tree got a conflict in:
>
> arch/x86/include/asm/mshyperv.h
>
> between commit:
>
> a0e2bf7cb700 ("x86/paravirt: Switch time pvops functions to use static_call()")
>
> from the tip tree and commit:
>
> eb3e1d370b4c ("clocksource/drivers/hyper-v: Handle sched_clock differences inline")
>
> from the hyperv tree.
>
> I fixed it up (I used the latter version of this file and then applied the
> following patch) 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.
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.
Thx!
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
next prev parent reply other threads:[~2021-03-16 15:03 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 [this message]
2021-03-16 15:05 ` Wei Liu
2021-03-16 21:07 ` Stephen Rothwell
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=20210316150254.GC18822@zn.tnic \
--to=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=sfr@canb.auug.org.au \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox