Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 5 Feb 2021 10:13:16 +0000
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
Message-ID: <20210205101316.rhxbacowjq7bii32@liuwe-devbox-debian-v2>
References: <20210205190202.29c2b74e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210205190202.29c2b74e@canb.auug.org.au>
User-Agent: NeoMutt/20180716
Precedence: bulk

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.