Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/mips/Kconfig
between commit:
d96927dfa449 ("MIPS: Select CONFIG_HANDLE_DOMAIN_IRQ and make it work.")
from the mips tree and commit:
29afe44a7fbe ("printk/nmi: generic solution for safe printk in NMI")
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
diff --cc arch/mips/Kconfig
index e4df64c411b7,56f57816613e..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -62,7 -62,7 +62,8 @@@ config MIP
select HAVE_IRQ_TIME_ACCOUNTING
select GENERIC_TIME_VSYSCALL
select ARCH_CLOCKSOURCE_DATA
+ select HANDLE_DOMAIN_IRQ
+ select HAVE_NMI
menu "Machine selection"
--
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
