Andrew Morton wrote:
> On Thu, 20 Dec 2007 10:55:51 -0600
> Jason Wessel <[email protected]> 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.
--
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]
