Messages in this thread | | | Date | Thu, 13 Mar 2014 00:07:50 +0000 | From | Mark Brown <> | Subject | linux-next: manual merge of the driver-core tree with the tip tree |
| |
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in arch/x86/Kconfig between commit b4df597ae51f ("audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL") from the tip tree and commit 2b9c1f03278 ("x86: align x86 arch with generic CPU modalias handling") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
diff --cc arch/x86/Kconfig index 81f8485bb6b7,7fab7e0b1a72..000000000000 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -127,7 -127,7 +127,8 @@@ config X8 select HAVE_DEBUG_STACKOVERFLOW select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64 select HAVE_CC_STACKPROTECTOR + select HAVE_ARCH_AUDITSYSCALL + select GENERIC_CPU_AUTOPROBE config INSTRUCTION_DECODER def_bool y [unhandled content-type:application/pgp-signature] | |