linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

[Tabi Timur-B04825]

On Wed, Oct 10, 2012 at 8:18 PM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:

>  arch/powerpc/include/asm/epapr_hcalls.h      |  511 --------------------------
>  arch/powerpc/include/uapi/asm/Kbuild         |    1 +
>  arch/powerpc/include/uapi/asm/epapr_hcalls.h |  511 ++++++++++++++++++++++++++

What is include/uapi?  epapr_hcalls.h is not a user-space header file.
 I don't remember seeing the original patch which moved it, so I don't
know where this comes from.


-- 
Timur Tabi
Linux kernel developer at Freescale