Hi Ingo, On Fri, 20 Feb 2009 10:37:34 +0100 Ingo Molnar <mingo@xxxxxxx> wrote: > > Hm, i'd love to eliminate the conflict, but it would either mean > us to pull the slab tree into the tracing tree, or the other way > around - and both have quite many items queued up to make this > impractical. That's OK, I expect to carry several conflict resolutions that only get fixed during the next merge window. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpNZi5GQPJ5V.pgp
Description: PGP signature
