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

Browse source

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

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

...

This commit is contained in:

Ingo Molnar 2017-01-31 08:38:17 +01:00

parent da0aa3dde0 24c2503255

commit f26483eaed

3 changed files with 20 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/include/asm/microcode.h

View file

20

arch/x86/kernel/cpu/microcode/core.c

View file

4

arch/x86/kernel/fpu/core.c

View file