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

- From: Stephen Rothwell \<hidden\>
- Date: 2012-10-11 01:05:21 
- List: linuxppc-dev
- Page: https://ratatoskr.run/linuxppc-dev/2012/10/3937700
- Thread: https://ratatoskr.run/linux-next/2012/10/3937700/t.md

```text
Hi Alexander,

Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/include/asm/Kbuild between commit c3617f72036c ("UAPI:
(Scripted) Disintegrate arch/powerpc/include/asm") from the powerpc-merge
tree and commit 4c09029a5639 ("KVM: PPC: Add support for ePAPR idle hcall
in host kernel") from the kvm-ppc tree.

I just removed epapr_hcalls.h from the Kbuild file as I am not sure how
it should be broken up.  David, can you have a look at this, please?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
```

## Attachments

- [(unnamed)](https://ratatoskr.run/linuxppc-dev/2012/10/3937700/attachment/0) (application/pgp-signature, 836 bytes)