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

Conflicts:
	arch/s390/include/asm/processor.h

diff --cc arch/s390/include/asm/processor.h
index d4477ba99a16893d109f1830f4e6fceadfe99403,eac4fb5fb826b1edb7ff38697a38f3a8c94b5443..01c97b980fa4fcdfc29e16715746c198153192f0
--- 1/arch/s390/include/asm/processor.h
--- 2/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@@ -140,7 -140,7 +140,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