From: Ingo Molnar Date: Fri, 15 Jul 2016 08:26:04 +0000 (+0200) Subject: Merge branch 'x86/asm' into x86/mm, to resolve conflicts X-Git-Tag: v4.8-rc1~180^2~15 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=38452af2424dc99854c78523d74b260fa8a984f0 Merge branch 'x86/asm' into x86/mm, to resolve conflicts Conflicts: tools/testing/selftests/x86/Makefile Signed-off-by: Ingo Molnar --- 38452af2424dc99854c78523d74b260fa8a984f0 diff --cc tools/testing/selftests/x86/Makefile index 543a6d07e7ce,abe9c35c1cb6..4f747ee07f10 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@@ -4,8 -4,8 +4,8 @@@ include ../lib.m .PHONY: all all_32 all_64 warn_32bit_failure clean -TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall \ +TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall test_mremap_vdso \ - check_initial_reg_state sigreturn ldt_gdt iopl + check_initial_reg_state sigreturn ldt_gdt iopl mpx-mini-test TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \ test_FCMOV test_FCOMI test_FISTTP \ vdso_restorer