Messages in this thread | | | Date | Mon, 8 Sep 2014 16:04:30 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm-arm tree with the kvm tree |
| |
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in arch/arm64/include/asm/kvm_host.h between commit 656473003bc7 ("KVM: forward declare structs in kvm_types.h") from the kvm tree and commit 6951e48bff0b ("KVM: ARM/arm64: fix non-const declaration of function returning const") from the kvm-arm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm64/include/asm/kvm_host.h index be9970a59497,50431d36732b..000000000000 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@@ -43,7 -41,8 +43,7 @@@ #define KVM_VCPU_MAX_FEATURES 3 - int kvm_target_cpu(void); -struct kvm_vcpu; + int __attribute_const__ kvm_target_cpu(void); int kvm_reset_vcpu(struct kvm_vcpu *vcpu); int kvm_arch_dev_ioctl_check_extension(long ext); [unhandled content-type:application/pgp-signature] | |