James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote: > I'm getting a fairly massive merge failure over our misc tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.0 misc > > It looks like a conflict with the motion to using wrappered Kbuild for > our asm-generic clones. I can try merging your branch in and then disintegrating on top of that. David -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
