Message-ID: <476BC3B0.6020902@windriver.com>
Date: Fri, 21 Dec 2007 07:46:24 -0600
From: Jason Wessel <jason.wessel@windriver.com>
User-Agent: Thunderbird 2.0.0.6 (X11/20071022)
MIME-Version: 1.0
To: Andrew Morton <akpm@linux-foundation.org>
CC: linux-kernel@vger.kernel.org
Subject: Re: 2.6.24-rc5-mm1
References: <20071213024050.7d6e5f3e.akpm@linux-foundation.org>	<476A9E97.4040105@windriver.com> <20071220151103.a873e22d.akpm@linux-foundation.org>
In-Reply-To: <20071220151103.a873e22d.akpm@linux-foundation.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1189
Lines: 37

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/