[lkml]   [2021]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the hyperv tree with Linus' tree
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.


 \ /
  Last update: 2021-02-05 11:18    [W:0.048 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site