Re: 2.6.24-rc5-mm1

Jason Wessel
2007-12-21T13:46:43Z

Andrew Morton wrote:
> On Thu, 20 Dec 2007 10:55:51 -0600
> Jason Wessel <jason.wessel@windriver.com> wrote:
>
>
>> Andrew Morton wrote:
>>
>>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc5/2.6.24-rc5-mm1/
>>>
>>> - git-kgdb.patch is still dropped for the same reason
>>>
>>>
[snip] Regarding the merge output targeting -mm
> Conflicts with the arm, ia64, mips, sh and driver trees (at least). I
> fixed most of them but gave up on sh, where there has been major code
> motion.
>
>

Andrew,

Given the churn in patches I think the best approach is to put kgdb
after you have cut a -mm1 so it can go in -mm2 or as a fix or however
you would like to manage it. The churn should be a whole lot less once
the new kgdb arch support gets merged.

I updated the for_mm branch to be against 2.6.24-rc5-mm1, and it will
merge cleanly. I can update again once the next mm branch is available.

Thanks,
Jason.