projects / platform / kernel / linux-exynos.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b8c1b8e ba155e2)
Merge branch 'linus' into x86/fpu
authorIngo Molnar <mingo@kernel.org>
Sat, 23 May 2015 14:47:12 +0000 (16:47 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 25 May 2015 07:39:19 +0000 (09:39 +0200)
commit3152657f104ce9b0f80793c92a745d5e97b43812
treeb720a75f328d16b999f02be8173e0db24ed699cbtree | snapshot
parentb8c1b8ea7b219a7ba6d58d97bfdf1403b741f8d5commit | diff
parentba155e2d21f6bf05de86a78dbe5bfd8757604a65commit | diff
Merge branch 'linus' into x86/fpu

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

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

By removing the FPU internal include files.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/kvm_host.h diff1 | diff2 | blob | history
arch/x86/kvm/cpuid.c diff1 | diff2 | blob | history
arch/x86/kvm/vmx.c diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
Domain: System / Kernel;