Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/s390/Kconfig between commit 0d2a4a69f5a01c8886323afe742487f35493e209
("[S390] convert s390 to generic IPI infrastructure") from the s390 tree
and commit a5f0c6822e6795927091d756c51b51320305654a
("cpumask:centralize-common-maps") from the rr tree.
Just overlapping additions. I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/s390/Kconfig
index abcc7f9,f7270d5..0000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -78,7 -75,7 +78,8 @@@ config S39
select HAVE_KRETPROBES
select HAVE_KVM if 64BIT
select HAVE_ARCH_TRACEHOOK
+ select USE_GENERIC_SMP_HELPERS if SMP
+ select INIT_ALL_POSSIBLE
source "init/Kconfig"
--
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
