Hi Russell,

On Fri, 23 May 2014 17:14:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the tip tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from arch/arm/include/asm/outercache.h:24:0,
>                  from arch/arm/include/asm/barrier.h:5,
>                  from arch/arm/include/asm/bitops.h:28,
>                  from include/linux/bitops.h:33,
>                  from include/linux/kernel.h:10,
>                  from include/asm-generic/bug.h:13,
>                  from arch/arm/include/asm/bug.h:61,
>                  from arch/arm/include/asm/div64.h:63,
>                  from include/linux/math64.h:5,
>                  from include/linux/jiffies.h:4,
>                  from init/calibrate.c:7:
> include/linux/bug.h:91:47: warning: 'struct bug_entry' declared inside parameter list [enabled by default]
> include/linux/bug.h:91:47: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
> include/linux/bug.h: In function 'is_warning_bug':
> include/linux/bug.h:93:12: error: dereferencing pointer to incomplete type
> 
>  ... and many, many more ...
> 
> Probably caused by commit 030d0178bdbd ("arch,arm: Convert
> smp_mb__*()") which added an include of asm/barrier.h to
> arch/arm/include/asm/bitops.h.  This has interacted with commit
> 59a3bc6d3343 ("ARM: outer cache: add WARN_ON() to outer_disable()")
> from the arm tree, which adds an include of linux/bug.h to
> arch/arm/include/asm/outercache.h.
> 
> I added the below merge fix patch.  Russell, this should be applied to
> your tree directly.

Ping?  I am still carrying this patch ...

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 23 May 2014 17:10:12 +1000
> Subject: [PATCH] ARM: outer cache: no need for bug.h in outercache.h
> 
> This fixes a cricular include dependency when combined with commits from
> the tip tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/include/asm/outercache.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
> index eaa8a28c6871..891a56b35bcf 100644
> --- a/arch/arm/include/asm/outercache.h
> +++ b/arch/arm/include/asm/outercache.h
> @@ -21,7 +21,6 @@
>  #ifndef __ASM_OUTERCACHE_H
>  #define __ASM_OUTERCACHE_H
>  
> -#include <linux/bug.h>
>  #include <linux/types.h>
>  
>  struct outer_cache_fns {
> -- 
> 2.0.0.rc4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au