On Thu, 23 Nov 2006 20:01:11 +0000
David Howells <[email protected]> wrote:
> Linus Torvalds <[email protected]> wrote:
>
> > I obviously didn't see how nasty the conflicts were, and I would want it
> > to be not too painful for Andrew. So I could either take it early after
> > 2.6.19 _or_ after Andrew has merged the bulk of his stuff, depending on
> > which way is easier.
>
> Perhaps if Andrew gives me an estimate of what patches he's going to commit
> this time around, I can use those as a base for my patch.
>
Most of the outstanding work is in git trees, so I don't know.
Just merge it late in merge window - we'll work it out.
But please make sure it's all done this time. ie: use grep. Heaps of simple
stuff got missed in the pt_regs conversion.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]