* linux-next: build failure after merge of the final tree (akpm and moduleh trees related)
@ 2011-08-25 6:17 Stephen Rothwell
2011-08-25 18:10 ` Paul Gortmaker
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-08-25 6:17 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Yanmin Zhang, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
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.
P.S. Andrew, these commits could do with better subject lines :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: build failure after merge of the final tree (akpm and moduleh trees related)
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
0 siblings, 0 replies; 2+ messages in thread
From: Paul Gortmaker @ 2011-08-25 18:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andrew Morton, linux-next, linux-kernel, Yanmin Zhang
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 :-(
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-25 18:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).