From: Wei Liu <wei.liu@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
Lillian Grassin-Drake <ligrassi@microsoft.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sunil Muthuswamy <sunilmut@microsoft.com>
Subject: Re: linux-next: manual merge of the hyperv tree with Linus' tree
Date: Fri, 5 Feb 2021 10:13:16 +0000 [thread overview]
Message-ID: <20210205101316.rhxbacowjq7bii32@liuwe-devbox-debian-v2> (raw)
In-Reply-To: <20210205190202.29c2b74e@canb.auug.org.au>
On Fri, Feb 05, 2021 at 07:02:02PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the hyperv tree got a conflict in:
>
> arch/x86/hyperv/hv_init.c
>
> between commit:
>
> fff7b5e6ee63 ("x86/hyperv: Initialize clockevents after LAPIC is initialized")
>
> from Linus' tree and commits:
>
> a06c2e7df586 ("x86/hyperv: extract partition ID from Microsoft Hypervisor if necessary")
> fa2c411b58fe ("x86/hyperv: implement an MSI domain for root partition")
>
> from the hyperv tree.
>
> I fixed it up (see below) 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.
>
Thanks Stephen.
I've fixed up the conflicts locally in hyperv-next.
Wei.
next prev parent reply other threads:[~2021-02-05 10:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 8:02 linux-next: manual merge of the hyperv tree with Linus' tree Stephen Rothwell
2021-02-05 10:13 ` Wei Liu [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-12 3:19 Stephen Rothwell
2019-07-09 9:53 Stephen Rothwell
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=20210205101316.rhxbacowjq7bii32@liuwe-devbox-debian-v2 \
--to=wei.liu@kernel.org \
--cc=decui@microsoft.com \
--cc=ligrassi@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sunilmut@microsoft.com \
/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;
as well as URLs for NNTP newsgroup(s).