Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/include/asm/Kbuild
between commit:
57853e8906a0 ("ARM: 8403/1: kbuild: don't use generic mcs_spinlock.h header")
from the arm tree and commit:
74cf1a5a0c64 ("mm: clean up per architecture MM hook header files")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/include/asm/Kbuild
index 517ef6dd22b9,30b3bc1666d2..000000000000
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -12,6 -12,8 +12,7 @@@ generic-y += irq_regs.
generic-y += kdebug.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
+ generic-y += mm-arch-hooks.h
generic-y += msgbuf.h
generic-y += param.h
generic-y += parport.h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
