On Wed, Jan 29, 2014 at 10:27 PM, Stephen Rothwell <s...@canb.auug.org.au> wrote: > 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).
Thanks, I'll check it out tomorrow morning (EDT) once you've published the latest linux-next and update accordingly, Paul. -- > > -- > Cheers, > Stephen Rothwell s...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/