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

- From: Tabi Timur-B04825 \<hidden\>
- Date: 2012-10-11 01:47:20 
- List: linuxppc-dev
- Page: https://ratatoskr.run/linuxppc-dev/2012/10/3937822
- Thread: https://ratatoskr.run/linux-next/2012/10/3937805/t.md

```text
On Wed, Oct 10, 2012 at 8:18 PM, Stephen Rothwell [ref] wr=
ote:

>  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.


--=20
Timur Tabi
Linux kernel developer at Freescale=
```