From: Paul Mundt <lethal@linux-sh.org>
To: Tim Abbott <tabbott@ksplice.com>
Cc: Sam Ravnborg <sam@ravnborg.org>,
linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>,
Anders Kaseorg <andersk@ksplice.com>
Subject: Re: [PATCH] Restructure BSS linker script macros.
Date: Tue, 21 Jul 2009 01:36:38 +0900 [thread overview]
Message-ID: <20090720163638.GB29422@linux-sh.org> (raw)
In-Reply-To: <alpine.DEB.1.10.0907181236440.23110@vinegar-pot.mit.edu>
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.
next prev parent reply other threads:[~2009-07-20 16:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-12 22:23 [PATCH] Restructure BSS linker script macros Tim Abbott
2009-07-16 18:20 ` Tim Abbott
2009-07-16 20:34 ` Sam Ravnborg
2009-07-16 20:46 ` Tim Abbott
2009-07-16 22:58 ` Tim Abbott
2009-07-17 22:06 ` Sam Ravnborg
2009-07-17 22:13 ` Sam Ravnborg
2009-07-20 14:39 ` Paul Mundt
2009-07-20 16:33 ` Tim Abbott
2009-07-20 16:36 ` Paul Mundt [this message]
2009-07-20 17:07 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090720163638.GB29422@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=andersk@ksplice.com \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=tabbott@ksplice.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox