From: Paolo Bonzini <pbonzini@redhat.com>
To: "Radim Krčmář" <rkrcmar@redhat.com>,
"Linus Torvalds" <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Marc Zyngier <marc.zyngier@arm.com>
Subject: Re: [GIT PULL] KVM updates for v4.9-rc1
Date: Thu, 6 Oct 2016 13:34:37 +0200 [thread overview]
Message-ID: <aeb67611-3771-ff0d-6be7-2fddeba1e3da@redhat.com> (raw)
In-Reply-To: <20161006111646.GA19924@potion>
On 06/10/2016 13:16, Radim Krčmář wrote:
> Linus,
>
> this merge needs one manual conflict resolution that is foretold in
> 3d9cd95f90b2 ("ARM: gic-v3: Work around definition of gic_write_bpr1").
> The commit says that the conflict is "obvious to resolve", but
> linux-next got it wrong, so I have pasted the correct resolution at the
> bottom -- inline assembly and surrounding #if should be removed, because
> the #if would always select the write_sysreg() branch.
This is nowhere as bad as 4.8, but I'd like to point out the right way to
do it: prepare a topic branch with the arch/arm/include/asm patches, and merge
it into both the irqchip and KVM-ARM trees. You can find three examples in this
merge window alone:
Paolo Bonzini (12):
Merge branch 'x86/amd-avic' of git://git.kernel.org/.../joro/iommu into HEAD
Paul Mackerras (8):
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
Christian Borntraeger (1):
Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next
So we can do better in 4.10. :)
Paolo
prev parent reply other threads:[~2016-10-06 11:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-06 11:16 Radim Krčmář
2016-10-06 11:34 ` 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=aeb67611-3771-ff0d-6be7-2fddeba1e3da@redhat.com \
--to=pbonzini@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=rkrcmar@redhat.com \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®