Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base

 Conflicts:
	arch/x86/include/asm/cpufeature.h

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

diff --cc arch/x86/include/asm/cpufeature.h
index 97e5f13ea471346435360126e67d129b202e287a,7a3fa7d70bd7783335700e044e7f736487069409..c594e04bf529ca27abf65505c3feacb8ed7e83da
--- 1/arch/x86/include/asm/cpufeature.h
--- 2/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@@ -126,9 -128,15 +126,8 @@@ extern const char * const x86_bug_flags
  #define cpu_has_aes           boot_cpu_has(X86_FEATURE_AES)
  #define cpu_has_avx           boot_cpu_has(X86_FEATURE_AVX)
  #define cpu_has_avx2          boot_cpu_has(X86_FEATURE_AVX2)
- #define cpu_has_pat           boot_cpu_has(X86_FEATURE_PAT)
 -#define cpu_has_clflush               boot_cpu_has(X86_FEATURE_CLFLUSH)
 -#define cpu_has_gbpages               boot_cpu_has(X86_FEATURE_GBPAGES)
 -#define cpu_has_arch_perfmon  boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
 -#define cpu_has_x2apic                boot_cpu_has(X86_FEATURE_X2APIC)
  #define cpu_has_xsave         boot_cpu_has(X86_FEATURE_XSAVE)
  #define cpu_has_xsaves                boot_cpu_has(X86_FEATURE_XSAVES)
 -#define cpu_has_osxsave               boot_cpu_has(X86_FEATURE_OSXSAVE)
 -#define cpu_has_hypervisor    boot_cpu_has(X86_FEATURE_HYPERVISOR)
  /*
   * Do not add any more of those clumsy macros - use static_cpu_has() for
   * fast paths and boot_cpu_has() otherwise!

diff --cc arch/x86/kernel/cpu/mtrr/generic.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge