From: Marc Zyngier <marc.zyngier@arm•com>
To: Brian Starkey <brian.starkey@arm•com>
Cc: Mark Brown <broonie@kernel•org>,
Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will.deacon@arm•com>,
Christoffer Dall <christoffer.dall@linaro•org>,
linaro-kernel@lists•linaro.org, kvmarm@lists•cs.columbia.edu,
linux-next@vger•kernel.org, linux-arm-kernel@lists•infradead.org,
kernel-build-reports@lists•linaro.org
Subject: Re: next-20160222 build: 5 failures 9 warnings (next-20160222)
Date: Mon, 22 Feb 2016 12:00:40 +0000 [thread overview]
Message-ID: <56CAF868.5020406@arm.com> (raw)
In-Reply-To: <20160222115243.GA5779@e106950-lin.cambridge.arm.com>
On 22/02/16 11:52, Brian Starkey wrote:
> Hi Mark,
>
> On Mon, Feb 22, 2016 at 10:41:42AM +0000, Marc Zyngier wrote:
>> I'm about to push the following patch on top of the KVM tree:
>>
>> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
>> index 43688d9..31fe7d6 100644
>> --- a/arch/arm64/include/asm/kvm_host.h
>> +++ b/arch/arm64/include/asm/kvm_host.h
>> @@ -333,11 +333,6 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,
>> hyp_stack_ptr, vector_ptr);
>> }
>>
>> -static inline void __cpu_init_stage2(void)
>> -{
>> - kvm_call_hyp(__init_stage2_translation);
>> -}
>> -
>> static inline void kvm_arch_hardware_disable(void) {}
>> static inline void kvm_arch_hardware_unsetup(void) {}
>> static inline void kvm_arch_sync_events(struct kvm *kvm) {}
>> @@ -349,4 +344,11 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu);
>> void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);
>> void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);
>>
>> +/* #define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__) */
>> +
>> +static inline void __cpu_init_stage2(void)
>> +{
>> + kvm_call_hyp(__init_stage2_translation);
>> +}
>> +
>> #endif /* __ARM64_KVM_HOST_H__ */
>>
>> This will create a new conflict, but will make the resolution 100% clear.
>
> I applied this, but arm64 defconfig wouldn't build until I uncommented
> the '#define kvm_call_hyp(...' line.
>
> Is that right?
This patch is intended as a merge indication so that when you do the
merge with the arm64 tree, it conflicts and you can resolve it by going
the right thing (merging the non-comment version of this line).
So yes, uncommenting it is the right thing to do.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2016-02-22 12:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 8:36 next-20160222 build: 5 failures 9 warnings (next-20160222) Build bot for Mark Brown
2016-02-22 10:08 ` Mark Brown
2016-02-22 10:41 ` Marc Zyngier
2016-02-22 11:52 ` Brian Starkey
2016-02-22 12:00 ` Marc Zyngier [this message]
2016-02-22 12:07 ` Brian Starkey
2016-02-22 12:44 ` Marc Zyngier
2016-02-22 13:19 ` Stephen Rothwell
2016-02-24 3:28 ` Mark Brown
2016-02-24 3:48 ` Stephen Rothwell
2016-02-24 4:16 ` Mark Brown
2016-02-22 10:19 ` Mark Brown
2016-02-22 10:25 ` Mark Brown
2016-02-22 10:37 ` Jean-Philippe Brucker
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=56CAF868.5020406@arm.com \
--to=marc.zyngier@arm$(echo .)com \
--cc=brian.starkey@arm$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=christoffer.dall@linaro$(echo .)org \
--cc=kernel-build-reports@lists$(echo .)linaro.org \
--cc=kvmarm@lists$(echo .)cs.columbia.edu \
--cc=linaro-kernel@lists$(echo .)linaro.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=will.deacon@arm$(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