[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20090720170713.GA6728@merkur.ravnborg.org>
Date: Mon, 20 Jul 2009 19:07:13 +0200
From: Sam Ravnborg <sam@...nborg.org>
To: Paul Mundt <lethal@...ux-sh.org>, Tim Abbott <tabbott@...lice.com>,
linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>,
Anders Kaseorg <andersk@...lice.com>
Subject: Re: [PATCH] Restructure BSS linker script macros.
On Tue, Jul 21, 2009 at 01:36:38AM +0900, Paul Mundt wrote:
> 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.
I plan to send Linus a pull request later today for the kbuild-fixes stuff.
I need to review the cahnges a last time.
Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists