There's a new conflict between this commit pending in x86/cpu:

  63edbaa4 x86/cpu/topology: Add support for the AMD 0x80000026 leaf

And these fixes in x86/urgent:

  c064b536 x86/cpu/amd: Make the NODEID_MSR union actually work
  1b3108f6 x86/cpu/amd: Make the CPUID 0x80000008 parser correct

Resolve them.

 Conflicts:
	arch/x86/kernel/cpu/topology_amd.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>