Hi Stephen,
On 4 February 2013 07:39, Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Merging signal/for-next (9005965 x86: convert to ksignal)
> CONFLICT (content): Merge conflict in arch/x86/Kconfig
I think this conflict has been resolved incorrectly.
Al's commit 1820f96 "burying unused conditionals" removed
GENERIC_SIGALTSTACK from config X86, but the merge
(c5395e2affed5c42200cb6e21e3380995ef22ae3) left GENERIC_SIGALTSTACK
in:
diff --cc arch/x86/Kconfig
index 32d4ff1,49fb44e..6979498
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -114,9 -113,9 +114,12 @@@ config X8
select MODULES_USE_ELF_REL if X86_32
select MODULES_USE_ELF_RELA if X86_64
select CLONE_BACKWARDS if X86_32
+ select ARCH_USE_BUILTIN_BSWAP
+ select GENERIC_SIGALTSTACK
+ select ARCH_USE_BUILTIN_BSWAP
+ select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
+ select OLD_SIGACTION if X86_32
+ select COMPAT_OLD_SIGACTION if IA32_EMULATION
config INSTRUCTION_DECODER
def_bool y
Cheers
James
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
