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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/kvm/include/x86_64/processor.h

between commit:

  ef6a74b2e55e ("KVM: sefltests: Add x86-64 test to verify MMU reacts to CPUID updates")

from the kvm tree and commit:

  75275d7fbef4 ("KVM: selftests: Introduce UCALL_UNHANDLED for unhandled vector reporting")

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 tools/testing/selftests/kvm/include/x86_64/processor.h
index 6d27a5435971,92a62c6999bc..000000000000
--- a/tools/testing/selftests/kvm/include/x86_64/processor.h
+++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@@ -55,11 -53,6 +55,9 @@@
  #define CPUID_PKU		(1ul << 3)
  #define CPUID_LA57		(1ul << 16)
  
 +/* CPUID.0x8000_0001.EDX */
 +#define CPUID_GBPAGES		(1ul << 26)
 +
- #define UNEXPECTED_VECTOR_PORT 0xfff0u
- 
  /* General Registers in 64-Bit Mode */
  struct gpr64_regs {
  	u64 rax;
@@@ -396,13 -389,9 +394,13 @@@ struct ex_regs 
  
  void vm_init_descriptor_tables(struct kvm_vm *vm);
  void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid);
- void vm_handle_exception(struct kvm_vm *vm, int vector,
+ void vm_install_exception_handler(struct kvm_vm *vm, int vector,
  			void (*handler)(struct ex_regs *));
  
 +uint64_t vm_get_page_table_entry(struct kvm_vm *vm, int vcpuid, uint64_t vaddr);
 +void vm_set_page_table_entry(struct kvm_vm *vm, int vcpuid, uint64_t vaddr,
 +			     uint64_t pte);
 +
  /*
   * set_cpuid() - overwrites a matching cpuid entry with the provided value.
   *		 matches based on ent->function && ent->index. returns true

Attachment: pgpkvhIZanQaQ.pgp
Description: OpenPGP digital signature