Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts

 Conflicts:
  arch/x86/kernel/cpu/microcode/amd.c
  arch/x86/kernel/cpu/microcode/core.c

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

diff --cc arch/x86/include/asm/microcode.h
Simple merge

diff --cc arch/x86/kernel/cpu/microcode/core.c
Simple merge