-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Bernhard Reutner-Fischer wrote: > On Mon, Nov 23, 2009 at 07:28:45AM +0100, Carmelo AMOROSO wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> 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. >>> For the old nptl branch, I have to cherry pick every commit by hand. > > Good idea. > Is there something preventing a rename of nptl_merge -> nptl now? >
IIRC, yes, ... all the code for cancellation handling is not yet merged. This is basically the only part deeply interleaved with not NPTL code, all NPTL/TLS/futexes are more self-contained. Austin, could you confirm ? Carmelo > _______________________________________________ > uClibc mailing list > uClibc@uclibc.org > http://lists.busybox.net/mailman/listinfo/uclibc > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAksKVgoACgkQoRq/3BrK1s8JMACeJn+1SJEAlnSsA7NIcSYmKLgx MUMAniyrAsvZw5+qRSEHhkqu3D3zAb0C =2dlT -----END PGP SIGNATURE----- _______________________________________________ uClibc mailing list uClibc@uclibc.org http://lists.busybox.net/mailman/listinfo/uclibc