Skip to content
Snippets Groups Projects
Commit 3152657f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/fpu


Resolve semantic conflict in arch/x86/kvm/cpuid.c with:

  c447e76b ("kvm/fpu: Enable eager restore kvm FPU for MPX")

By removing the FPU internal include files.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b8c1b8ea ba155e2d
No related branches found
No related tags found
Showing
with 115 additions and 55 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment