Re: [GIT PULL] Disintegrate UAPI for x86

From: David Howells
Date: Fri Oct 05 2012 - 08:54:06 EST


H. Peter Anvin <hpa@xxxxxxxxx> wrote:

> That branch does have generic patches which are not yet in upstream. I
> presume that is intentional.

Yeah. It works better if the generic patches are there first. I thought that
as long as everyone pulls the same disintegrate-asm-generic branch at the
bottom of their tree, then git merging should work just fine.

OTOH, not everyone is willing to pull their branch in this window, so, if
Linus pulls the prep patches and Arnd pushes the asm-generic bits, then the
lower layers can go away and everyone gets a branch with only their bits on.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/