Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
lib/Kconfig.debug between commit adf8b37bafc1495393201a2ae4235846371870d0
("[ARM] 5386/2: unwind: Add Makefile and Kconfig entries for ARM stack
unwinding") from the arm tree and commit
1075414b06109a99b0e87601e84c74a95bd45681 ("lockdep: require framepointers
for x86") from the tip-core tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc lib/Kconfig.debug
index 0626fa4,4742459..0000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -402,7 -440,7 +440,7 @@@ config LOCKDE
bool
depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
select STACKTRACE
- select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND
- select FRAME_POINTER if !MIPS && !PPC
++ select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND
select KALLSYMS
select KALLSYMS_ALL
--
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
