linux-next: manual merge of the init tree with the kvm/kvm-ppctrees

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the init tree got conflicts in
arch/powerpc/kvm/44x.c, arch/powerpc/kvm/e500.c,
arch/powerpc/kvm/e500mc.c between commit 398a76c677a2 ("KVM: PPC: Add
devname:kvm aliases for modules") from the kvm/kvm-ppc trees and commit
"powerpc: kvm e500/44x is not modular, so don't use module_init" from the
init tree.

It sounds like there may be some intent to allow these to be built as
modules in the future, so for now I have just reverted the init tree
patch to these files and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature