linux-kernel - linux-next: build failure after merge of the final tree (akpm and moduleh trees related)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 25 Aug 2011 16:17:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yanmin Zhang <yanmin_zhang@...ux.intel.com>,
	Paul Gortmaker <paul.gortmaker@...driver.com>
Subject: linux-next: build failure after merge of the final tree (akpm and
 moduleh trees related)

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped