From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yanmin Zhang <yanmin_zhang@linux.intel.com>
Subject: Re: linux-next: build failure after merge of the final tree (akpm and moduleh trees related)
Date: Thu, 25 Aug 2011 14:10:08 -0400 [thread overview]
Message-ID: <4E569000.302@windriver.com> (raw)
In-Reply-To: <20110825161750.45803be66cba17a6bd3906bc@canb.auug.org.au>
On 11-08-25 02:17 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> kernel/printk.c:536:35: error: expected ')' before string constant
> kernel/printk.c:1116:35: error: expected ')' before string constant
>
> Caused by commits 8a04dedc045d ("We are enabling some power features on
> medfield. To test suspend-2-RAM") and d09d67ec904c (same - the following
> commit) from the akpm tree interacting with commit a25ffe9fafa1 ("kernel:
> Map most files to use export.h instead of module.h") from the moduleh
> tree. This file now needs module.h, not just export.h since
> MODULE_PARM_DESC if defined there.
>
> I have applied a merge fixup patch to change export.h back to module.h.
Thanks Stephen, I've excluded kernel/printk.c from the conversion to
export.h today.
Paul.
>
> P.S. Andrew, these commits could do with better subject lines :-(
prev parent reply other threads:[~2011-08-25 18:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 6:17 linux-next: build failure after merge of the final tree (akpm and moduleh trees related) Stephen Rothwell
2011-08-25 18:10 ` Paul Gortmaker [this message]
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=4E569000.302@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yanmin_zhang@linux.intel.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;
as well as URLs for NNTP newsgroup(s).