Re: [GIT PULL] Disintegrate UAPI for parisc [ver #2]

From: David Howells
Date: Tue Oct 16 2012 - 15:08:24 EST

James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote:

> I'm getting a fairly massive merge failure over our misc tree:
> git:// 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.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at