On Wed, Dec 21, 2011 at 13:28, Craig Small <csmall-procps@xxxxxxxxxx> wrote: > On Tue, Dec 20, 2011 at 03:49:01PM +0100, Sami Kerola wrote: >> Here comes 101 first nls patches. All top nls work is out from this >> pull request. The top patches are attached and I assume Jim will do >> something like > Just so its clear to me, did you want to wait for Jim to resolve > conflicts then roll it in? Not really. The nls branch is ready for merge, and as it holds 'lock' for pmap development it might be good idea to get it in. That would also be quite nice christmas present to me; when the branch is merged I know that I will never need to resolve conflicts in it again. Besides I'm expecting Jim is resolving his top patch issues on top of nls branch (which I did not explicitly mention earlier, sorry Jim). The reason why I'm expecting that is simply my laziness; I don't want to deal thous 101 patches ever again. -- Sami Kerola http://www.iki.fi/kerolasa/