Hi Rafael, Today's linux-next merge of the suspend tree got a conflict in arch/x86/Kconfig between commit 0a14842f5a3c ("net: filter: Just In Time compiler for x86-64") from the tree and commit d9f1ce017fcf ("PM: Remove sysdev suspend, resume and shutdown operations") from the suspend tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/x86/Kconfig index 92d07bd,140e254..0000000 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -71,8 -71,6 +71,7 @@@ config X8 select GENERIC_IRQ_SHOW select IRQ_FORCED_THREADING select USE_GENERIC_SMP_HELPERS if SMP - select ARCH_NO_SYSDEV_OPS + select HAVE_BPF_JIT if X86_64 config INSTRUCTION_DECODER def_bool (KPROBES || PERF_EVENTS) -- 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