From: Thomas Gleixner Date: Mon, 4 Feb 2013 10:03:03 +0000 (+0100) Subject: Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into... X-Git-Tag: v3.9-rc1~170^2~5 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=90889a635a9b5488624bccce3ff6b2eec68c007b;p=linux.git Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core Trivial conflict in arch/x86/Kconfig Signed-off-by: Thomas Gleixner --- 90889a635a9b5488624bccce3ff6b2eec68c007b diff --cc arch/x86/Kconfig index 225543bf45a5,335da90560e4..97b023f0cbe8 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -106,14 -104,15 +106,15 @@@ config X8 select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC) select GENERIC_TIME_VSYSCALL if X86_64 select KTIME_SCALAR if X86_32 ++ select ALWAYS_USE_PERSISTENT_CLOCK select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER - select HAVE_RCU_USER_QS if X86_64 + select HAVE_CONTEXT_TRACKING if X86_64 select HAVE_IRQ_TIME_ACCOUNTING - select ALWAYS_USE_PERSISTENT_CLOCK - select GENERIC_KERNEL_THREAD - select GENERIC_KERNEL_EXECVE select MODULES_USE_ELF_REL if X86_32 select MODULES_USE_ELF_RELA if X86_64 + select CLONE_BACKWARDS if X86_32 + select GENERIC_SIGALTSTACK config INSTRUCTION_DECODER def_bool y