From: Marc Zyngier <marc.zyngier@arm.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Austin <Jonathan.Austin@arm.com>,
Christoffer Dall <cdall@cs.columbia.edu>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-arm tree
Date: Fri, 25 Oct 2013 14:07:41 +0100 [thread overview]
Message-ID: <526A6D1D.8080504@arm.com> (raw)
In-Reply-To: <1382706224-8859-5-git-send-email-treding@nvidia.com>
On 25/10/13 14:03, Thierry Reding wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in
>
> arch/arm/kvm/reset.c
>
> caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and 7999b4d
> (ARM: KVM: drop limitation to 4 CPU VMs).
>
> I fixed it up (see below). Please verify that the resolution looks good.
Looks good. Thanks Thierry.
M.
> Thanks,
> Thierry
> ---
> diff --cc arch/arm/kvm/reset.c
> index d153e64,2c5add0..f558c07
> --- a/arch/arm/kvm/reset.c
> +++ b/arch/arm/kvm/reset.c
> @@@ -64,9 -62,7 +62,7 @@@ int kvm_reset_vcpu(struct kvm_vcpu *vcp
> switch (vcpu->arch.target) {
> case KVM_ARM_TARGET_CORTEX_A7:
> case KVM_ARM_TARGET_CORTEX_A15:
> - if (vcpu->vcpu_id > cortexa_max_cpu_idx)
> - return -EINVAL;
> - cpu_reset = &cortexa_regs_reset;
> + reset_regs = &cortexa_regs_reset;
> vcpu->arch.midr = read_cpuid_id();
> cpu_vtimer_irq = &cortexa_vtimer_irq;
> break;
>
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2013-10-25 13:07 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-24 20:02 ` linux-next: Tree for Oct 24 (xilinx_uartps) Randy Dunlap
2013-10-25 5:02 ` linux-next: Tree for Oct 24 Guenter Roeck
2013-10-25 8:35 ` Thierry Reding
2013-10-25 13:16 ` Olof Johansson
2013-10-25 13:24 ` Mark Brown
2013-10-25 13:33 ` Olof Johansson
2013-10-25 15:45 ` Mark Brown
2013-10-25 13:35 ` Thierry Reding
2013-10-25 13:43 ` Olof Johansson
2013-10-25 14:17 ` Thierry Reding
2013-10-25 15:02 ` Guenter Roeck
2013-10-25 15:17 ` Thierry Reding
2013-10-25 17:17 ` Guenter Roeck
2013-10-25 18:04 ` Geert Uytterhoeven
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the h8300-remove tree Thierry Reding
2013-10-25 13:35 ` Mark Salter
2013-10-25 15:09 ` Guenter Roeck
2013-10-25 13:03 ` linux-next: manual merge of the mfd-lj tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25 ` Will Deacon
2013-10-26 8:40 ` Ingo Molnar
2013-10-26 14:01 ` Will Deacon
2013-10-27 7:12 ` Ingo Molnar
2013-10-27 10:00 ` Russell King - ARM Linux
2013-10-28 7:47 ` Thierry Reding
2013-10-28 8:45 ` Russell King - ARM Linux
2013-10-25 13:03 ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-25 13:07 ` Marc Zyngier [this message]
2013-10-25 13:03 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-25 13:22 ` linux-next: manual merge of the c6x tree Mark Salter
2013-10-25 13:36 ` Thierry Reding
2013-10-26 13:19 ` Russell King - ARM Linux
2013-10-28 7:34 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2013-10-16 18:51 linux-next: Tree for Oct 16 Thierry Reding
2013-10-16 18:51 ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-16 18:58 ` Marc Zyngier
2013-10-16 19:02 ` Christoffer Dall
2013-10-16 19:04 ` Thierry Reding
2013-10-16 19:09 ` Christoffer Dall
2013-10-17 14:55 ` Gleb Natapov
2013-10-17 16:53 ` 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=526A6D1D.8080504@arm.com \
--to=marc.zyngier@arm.com \
--cc=Jonathan.Austin@arm.com \
--cc=cdall@cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thierry.reding@gmail.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;
as well as URLs for NNTP newsgroup(s).