* linux-next: build failure after merge of the final tree (powercp tree related)
@ 2012-11-15 7:06 Stephen Rothwell
2012-11-15 7:11 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-11-15 7:06 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
Cc: linux-next, linux-kernel, Nathan Fontenot
[-- Attachment #1: Type: text/plain, Size: 1555 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
lib/pSeries-reconfig-notifier-error-inject.c:4:34: fatal error: asm/pSeries_reconfig.h: No such file or directory
Caused by commit f459d63e1689 ("powerpc+of: Remove the pSeries_reconfig.h
file") and even if the file existed, things were removed by commit
1cf3d8b3d24c ("powerpc+of: Add of node/property notification chain for
adds and removes") that would cause
lib/pSeries-reconfig-notifier-error-inject.c to fail to build. I have
marked it as broken for now using this patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Nov 2012 18:02:13 +1100
Subject: [PATCH] lib: disable PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
It has been fundamentally broken by other changes.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
lib/Kconfig.debug | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 41faf0b..ad84944 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1195,6 +1195,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT
config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
tristate "pSeries reconfig notifier error injection module"
depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION
+ depends on BROKEN
help
This option provides the ability to inject artifical errors to
pSeries reconfig notifier chain callbacks. It is controlled
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: linux-next: build failure after merge of the final tree (powercp tree related)
2012-11-15 7:06 linux-next: build failure after merge of the final tree (powercp tree related) Stephen Rothwell
@ 2012-11-15 7:11 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2012-11-15 7:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Mackerras, linuxppc-dev, linux-next, linux-kernel, Nathan Fontenot
On Thu, 2012-11-15 at 18:06 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> lib/pSeries-reconfig-notifier-error-inject.c:4:34: fatal error: asm/pSeries_reconfig.h: No such file or directory
>
> Caused by commit f459d63e1689 ("powerpc+of: Remove the pSeries_reconfig.h
> file") and even if the file existed, things were removed by commit
> 1cf3d8b3d24c ("powerpc+of: Add of node/property notification chain for
> adds and removes") that would cause
> lib/pSeries-reconfig-notifier-error-inject.c to fail to build. I have
> marked it as broken for now using this patch:
My bad, didn't notice, I don't have error injection enabled in my test
configs. I think that stuff went in after the original patches were
written I think.
Not a big deal, nobody actually enables that error inject test stuff
just yet, I'll put a fix patch into my "dt" and my "next" branch asap.
Cheers,
Ben.
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 15 Nov 2012 18:02:13 +1100
> Subject: [PATCH] lib: disable PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
>
> It has been fundamentally broken by other changes.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> lib/Kconfig.debug | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index 41faf0b..ad84944 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -1195,6 +1195,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT
> config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
> tristate "pSeries reconfig notifier error injection module"
> depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION
> + depends on BROKEN
> help
> This option provides the ability to inject artifical errors to
> pSeries reconfig notifier chain callbacks. It is controlled
> --
> 1.7.10.280.gaa39
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-15 7:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-15 7:06 linux-next: build failure after merge of the final tree (powercp tree related) Stephen Rothwell
2012-11-15 7:11 ` Benjamin Herrenschmidt
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).