From: Paul Gortmaker <paul.gortmaker@windriver•com>
To: Jiri Kosina <jkosina@suse•cz>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jesper Juhl <jj@chaosbits•net>
Subject: Re: linux-next: build failure after merge of the final tree (moduleh/trivial trees related)
Date: Tue, 6 Mar 2012 09:14:01 -0500 [thread overview]
Message-ID: <4F561BA9.8020504@windriver.com> (raw)
In-Reply-To: <20120306175844.9c97ac3bcc5579fba377fbd8@canb.auug.org.au>
On 12-03-06 01:58 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/power/max8998_charger.c:198:12: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/power/max8998_charger.c:207:20: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:208:15: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:209:16: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:210:14: error: expected declaration specifiers or '...' before string constant
>
> Caused by commit 13ae246db4a0 ("includecheck: delete any duplicate
> instances of module.h") from the moduleh tree interacting with commit
> ce64b8d85de9 ("power, max8998: Include linux/module.h just once in
> drivers/power/max8998_charger.c") from the trivial tree.
Hi Jiri,
Since we'll still have the global dup removal commit regardless,
it probably makes sense to just drop the one in trivial. But if
that is a problem for one reason or another, let me know and I'll
fixup my commit to at least delete the same one you delete.
Thanks,
Paul.
>
> They both removed different includes of module.h leaving none.
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 6 Mar 2012 17:56:45 +1100
> Subject: [PATCH] power, max8998: we need at least one include of module.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/power/max8998_charger.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
> index d6a8c16..5c5f281 100644
> --- a/drivers/power/max8998_charger.c
> +++ b/drivers/power/max8998_charger.c
> @@ -19,6 +19,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> +#include <linux/module.h>
> #include <linux/err.h>
> #include <linux/slab.h>
> #include <linux/platform_device.h>
next prev parent reply other threads:[~2012-03-06 14:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 6:58 linux-next: build failure after merge of the final tree (moduleh/trivial trees related) Stephen Rothwell
2012-03-06 14:14 ` Paul Gortmaker [this message]
2012-03-06 14:14 ` Jiri Kosina
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=4F561BA9.8020504@windriver.com \
--to=paul.gortmaker@windriver$(echo .)com \
--cc=jj@chaosbits$(echo .)net \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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