Merge branch 'x86/asm' into x86/mm, to resolve conflicts

 Conflicts:
	tools/testing/selftests/x86/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/boot/boot.h
Simple merge

diff --cc tools/testing/selftests/x86/Makefile
index 543a6d07e7ce8627c4bf0d19ea645354e0b8a639,abe9c35c1cb605439e4da898233dfb44e28ce4ad..4f747ee07f10a93447642ecf9d52e7d5e93f524b
--- 1/tools/testing/selftests/x86/Makefile
--- 2/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