lkml.org 
[lkml]   [2009]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Restructure BSS linker script macros.
On Mon, Jul 20, 2009 at 12:33:07PM -0400, Tim Abbott wrote:
> On Sat, 18 Jul 2009, Sam Ravnborg wrote:
> > I do not expect Tejun's work to be included until next merge window.
>
> Yes, but I expect the "sh" patch presumably to go in at the next merge
> window as well. Since in this case the conflict was both patches making
> similar changes where Tejun's was more extensive, I figured I might as
> well save someone from having to resolve this useless merge conflict
> during the next merge window.
>
Correct, the sh change is queued for the next merge window. For 2.6.31 we
are not using the generic macros in the script, so the breakage is
immaterial there. There will be a bit of an ordering issue for the merge
window with regards to the kbuild fixes, but as long as the revised
macros show up at some point then I can merge after that. If kbuild-fixes
merges before the merge window then of course the ordering issue goes
away.


\
 
 \ /
  Last update: 2009-07-20 18:41    [W:0.049 / U:3.580 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site