nptl branch going away, use nptl_merge
Rob Landley
rob at landley.net
Tue Nov 24 03:51:43 UTC 2009
On Sunday 22 November 2009 14:15:23 Austin Foxley wrote:
> For my own sanity, I'm killing (renaming) the non master based nptl
> branch. The difference of effort in keeping the two synced to master is
> quite significant.
>
> For the master based nptl_merge, all I have to do is a
> 'git merge origin/master' and fixup any conflicts. Done.
Ooh, catching up on the non-cc: list emails, just made it to this thread. So
pretty much you automatically get all the changes checked into "master", and
we can now completely ignore "master" as a separate entity. Merge done, as
far as I'm concerned.
I'll start testing it.
Thanks,
Rob
--
Latency is more important than throughput. It's that simple. - Linus Torvalds
More information about the uClibc
mailing list