Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	arch/s390/include/asm/processor.h
	arch/x86/kvm/i8259.c

diff --cc arch/s390/include/asm/processor.h
index f3e0aabfc6bcb003a367b9b0e5d9d2087989e28e,eac4fb5fb826b1edb7ff38697a38f3a8c94b5443..56831dfa9198c6e2192605fd5ee9d68c538d8b17
--- 1/arch/s390/include/asm/processor.h
--- 2/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@@ -158,7 -140,7 +158,8 @@@ extern int kernel_thread(int (*fn)(voi
  extern unsigned long thread_saved_pc(struct task_struct *t);
  
  extern void show_code(struct pt_regs *regs);
 +extern void print_fn_code(unsigned char *code, unsigned long len);
+ extern int insn_to_mnemonic(unsigned char *instruction, char buf[8]);
  
  unsigned long get_wchan(struct task_struct *p);
  #define task_pt_regs(tsk) ((struct pt_regs *) \

diff --cc arch/s390/kernel/dis.c
Simple merge

diff --cc arch/s390/kvm/Kconfig
Simple merge

diff --cc arch/s390/kvm/priv.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge