Re: linux-next: manual merge of the kvm tree with the kvm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 12/16/21 05:47, Michael Ellerman wrote:
broonie@xxxxxxxxxx writes:
Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

   arch/powerpc/kvm/book3s_hv.c

between commit:

   511d25d6b789f ("KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots")

from the kvm tree and commits:

That's from the powerpc tree.

   537a17b314930 ("KVM: Let/force architectures to deal with arch specific memslot data")
   eaaaed137eccb ("KVM: PPC: Avoid referencing userspace memory region in memslot updates")

from the kvm 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.

Paolo, if you want to avoid the conflict going to Linus, I have that
commit (and others) in a topic branch here (based on rc2):

   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/log/?h=topic/ppc-kvm

Will pull, thanks!

Paolo




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux