From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Mar 2016 02:46:37 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: next-20160308~35
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=131a7471538a9d55ebf6311fc6a5214f1d30950b;p=karo-tx-linux.git

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

131a7471538a9d55ebf6311fc6a5214f1d30950b
diff --cc arch/powerpc/kvm/book3s_64_vio_hv.c
index 039028d3ccb5,44be73e6aa26..f88b859af53b
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@@ -29,7 -30,8 +30,8 @@@
  #include <asm/tlbflush.h>
  #include <asm/kvm_ppc.h>
  #include <asm/kvm_book3s.h>
 -#include <asm/mmu-hash64.h>
 +#include <asm/book3s/64/mmu-hash.h>
+ #include <asm/mmu_context.h>
  #include <asm/hvcall.h>
  #include <asm/synch.h>
  #include <asm/ppc-opcode.h>