From: Paolo Bonzini <pbonzini@redhat•com>
To: Michael Ellerman <mpe@ellerman•id.au>,
broonie@kernel•org, KVM <kvm@vger•kernel.org>
Cc: Alexey Kardashevskiy <aik@ozlabs•ru>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Maciej S . Szmigiero" <maciej.szmigiero@oracle•com>,
Sean Christopherson <seanjc@google•com>
Subject: Re: linux-next: manual merge of the kvm tree with the kvm tree
Date: Fri, 17 Dec 2021 18:07:15 +0100 [thread overview]
Message-ID: <6e2518c1-78d0-8103-69ea-40a625259ef8@redhat.com> (raw)
In-Reply-To: <87wnk5kvfz.fsf@mpe.ellerman.id.au>
On 12/16/21 05:47, Michael Ellerman wrote:
> broonie@kernel•org 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
prev parent reply other threads:[~2021-12-17 17:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 13:10 linux-next: manual merge of the kvm tree with the kvm tree broonie
2021-12-16 4:47 ` Michael Ellerman
2021-12-17 17:07 ` Paolo Bonzini [this message]
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=6e2518c1-78d0-8103-69ea-40a625259ef8@redhat.com \
--to=pbonzini@redhat$(echo .)com \
--cc=aik@ozlabs$(echo .)ru \
--cc=broonie@kernel$(echo .)org \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maciej.szmigiero@oracle$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=seanjc@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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