From: Mark Rutland <mark.rutland@arm.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>,
Marc Zyngier <Marc.Zyngier@arm.com>,
Catalin Marinas <Catalin.Marinas@arm.com>,
Will Deacon <Will.Deacon@arm.com>,
"kvmarm@lists.cs.columbia.edu" <kvmarm@lists.cs.columbia.edu>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
Andre Przywara <Andre.Przywara@arm.com>
Subject: Re: [GIT PULL 03/36] arm/arm64: KVM: add tracing support for arm64 exit handler
Date: Fri, 23 Jan 2015 13:41:57 +0000 [thread overview]
Message-ID: <20150123134157.GL23493@leverpostej> (raw)
In-Reply-To: <54C24365.1000503@redhat.com>
On Fri, Jan 23, 2015 at 12:49:41PM +0000, Paolo Bonzini wrote:
>
>
> On 23/01/2015 13:01, Paolo Bonzini wrote:
> >
> >
> > On 23/01/2015 12:35, Mark Rutland wrote:
> >>
> >> https://lkml.org/lkml/2015/1/22/7
> >> https://lkml.org/lkml/2015/1/22/8
> >>
> >> I'd hoped we'd be able to fix that before this went further upstream.
> >>
> >> The easiest way I could see to do that was to merge my esr branch (which
> >> is stable and Catalin has pulled) branch into the kvm-arm tree, and fix
> >> the conflicts there.
> >>
> >> Is there any chance we can fix that now?
> >
> > I'll fix the conflicts in the kvm tree. Please wait for further
> > instructions...
>
> Ok folks, please check that the resolution in the queue branch of
> git://git.kernel.org/pub/scm/virt/kvm/kvm.git is okay.
That looks fine to me. Git was happy to merge the arm64 for-next/core
branch, and the result boots fine on my Juno.
Thanks for handling the fixup!
Mark.
next prev parent reply other threads:[~2015-01-23 13:42 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-23 10:02 [GIT PULL 00/36] KVM/ARM changes for 3.20 Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 01/36] KVM: arm/arm64: vgic: vgic_init returns -ENODEV when no online vcpu Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 02/36] KVM: arm/arm64: vgic: add init entry to VGIC KVM device Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 03/36] arm/arm64: KVM: add tracing support for arm64 exit handler Christoffer Dall
2015-01-23 11:35 ` Mark Rutland
2015-01-23 12:01 ` Paolo Bonzini
2015-01-23 12:49 ` Paolo Bonzini
2015-01-23 12:55 ` Christoffer Dall
2015-01-23 13:41 ` Mark Rutland [this message]
2015-01-23 10:02 ` [GIT PULL 04/36] ARM: KVM: extend WFI tracepoint to differentiate between wfi and wfe Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 05/36] KVM: Add architecture-defined TLB flush support Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 06/36] KVM: Add generic support for dirty page logging Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 07/36] KVM: x86: switch to kvm_get_dirty_log_protect Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 08/36] KVM: arm: Add ARMv7 API to flush TLBs Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 09/36] KVM: arm: Add initial dirty page locking support Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 10/36] KVM: arm: dirty logging write protect support Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 11/36] KVM: arm: page logging 2nd stage fault handling Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 12/36] KVM: arm64: ARMv8 header changes for page logging Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 13/36] KVM: arm64: Add HYP interface to flush VM Stage 1/2 TLB entries Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 14/36] KVM: arm/arm64: Enable Dirty Page logging for ARMv8 Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 15/36] arm/arm64: KVM: rework MPIDR assignment and add accessors Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 16/36] arm/arm64: KVM: pass down user space provided GIC type into vGIC code Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 17/36] arm/arm64: KVM: refactor vgic_handle_mmio() function Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 18/36] arm/arm64: KVM: wrap 64 bit MMIO accesses with two 32 bit ones Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 19/36] arm/arm64: KVM: introduce per-VM ops Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 20/36] arm/arm64: KVM: move kvm_register_device_ops() into vGIC probing Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 21/36] arm/arm64: KVM: dont rely on a valid GICH base address Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 22/36] arm/arm64: KVM: make the maximum number of vCPUs a per-VM value Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 23/36] arm/arm64: KVM: make the value of ICC_SRE_EL1 a per-VM variable Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 24/36] arm/arm64: KVM: refactor MMIO accessors Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 25/36] arm/arm64: KVM: refactor/wrap vgic_set/get_attr() Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 26/36] arm/arm64: KVM: add vgic.h header file Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 27/36] arm/arm64: KVM: split GICv2 specific emulation code from vgic.c Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 28/36] arm/arm64: KVM: add opaque private pointer to MMIO data Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 29/36] arm/arm64: KVM: add virtual GICv3 distributor emulation Christoffer Dall
2015-01-23 10:02 ` [GIT PULL 30/36] arm64: GICv3: introduce symbolic names for GICv3 ICC_SGI1R_EL1 fields Christoffer Dall
2015-01-23 10:03 ` [GIT PULL 31/36] arm64: KVM: add SGI generation register emulation Christoffer Dall
2015-01-23 10:03 ` [GIT PULL 32/36] arm/arm64: KVM: enable kernel side of GICv3 emulation Christoffer Dall
2015-01-23 10:03 ` [GIT PULL 33/36] arm/arm64: KVM: allow userland to request a virtual GICv3 Christoffer Dall
2015-01-23 10:03 ` [GIT PULL 34/36] arm/arm64: KVM: force alignment of VGIC dist/CPU/redist addresses Christoffer Dall
2015-01-23 10:03 ` [GIT PULL 35/36] arm/arm64: KVM: Fixup incorrect config symbol in comment Christoffer Dall
2015-01-23 10:03 ` [GIT PULL 36/36] KVM: Remove unused config symbol Christoffer Dall
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=20150123134157.GL23493@leverpostej \
--to=mark.rutland@arm.com \
--cc=Andre.Przywara@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Marc.Zyngier@arm.com \
--cc=Will.Deacon@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=pbonzini@redhat.com \
/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