linux-next: manual merge of the kvm-arm tree with the kvm-fixes tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1469 bytes --]

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  arch/arm/include/asm/kvm_host.h

between commit:

  358b28f09f0a ("arm/arm64: KVM: Allow a VCPU to fully reset itself")

from the kvm-fixes tree and commit:

  42a2502ef5f8 ("arm/arm64: KVM: Statically configure the host's view of MPIDR")

from the kvm-arm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/include/asm/kvm_host.h
index 50e89869178a,8073267dc4a0..000000000000
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@@ -148,13 -151,13 +152,20 @@@ struct kvm_cpu_context 
  
  typedef struct kvm_cpu_context kvm_cpu_context_t;
  
+ static inline void kvm_init_host_cpu_context(kvm_cpu_context_t *cpu_ctxt,
+ 					     int cpu)
+ {
+ 	/* The host's MPIDR is immutable, so let's set it up at boot time */
+ 	cpu_ctxt->cp15[c0_MPIDR] = cpu_logical_map(cpu);
+ }
+ 
 +struct vcpu_reset_state {
 +	unsigned long	pc;
 +	unsigned long	r0;
 +	bool		be;
 +	bool		reset;
 +};
 +
  struct kvm_vcpu_arch {
  	struct kvm_cpu_context ctxt;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]