linux-toradex.git/arch/powerpc/include/uapi/asm/kvm_para.h, branch v3.9.2 Linux kernel for Apalis and Colibri modules powerpc: Corrected include header path in kvm_para.h 2012-12-20T10:23:32+00:00 Bharat Bhushan r65777@freescale.com 2012-12-18T01:21:28+00:00 1509ae56cdc19a12f76000e31602e4119fffc571 The include/uapi/asm/kvm_para.h includes <include/uapi/asm/epapr_hcalls.h> but the correct reference should be <include/asm/epapr_hcalls.h> as this is the place where make install_header installs the header files for userspace. Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com> CC: stable@vger.kernel.org Signed-off-by: Alexander Graf <agraf@suse.de> 
The include/uapi/asm/kvm_para.h includes
<include/uapi/asm/epapr_hcalls.h> but the correct reference
should be <include/asm/epapr_hcalls.h> as this is the place
where make install_header installs the header files for
userspace.

Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com>
CC: stable@vger.kernel.org
Signed-off-by: Alexander Graf <agraf@suse.de>
Merge remote-tracking branch 'master' into queue 2012-10-29T21:15:32+00:00 Marcelo Tosatti mtosatti@redhat.com 2012-10-29T21:15:32+00:00 19bf7f8ac3f8131100027281c495dbbe00cd5ae0 Merge reason: development work has dependency on kvm patches merged upstream. Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/asm/kvm_para.h Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> 
Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/asm/kvm_para.h

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
UAPI: (Scripted) Disintegrate arch/powerpc/include/asm 2012-10-09T08:47:26+00:00 David Howells dhowells@redhat.com 2012-10-09T08:47:26+00:00 c3617f72036c909e1f6086b5b9e364e0ef90a6da Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com> 
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>