linux-next: manual merge of the kvm tree with the tip tree

From: Stephen Rothwell
Date: Sun Nov 27 2016 - 22:57:00 EST

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:


between commit:

c592b5734706 ("x86/fpu: Remove use_eager_fpu()")

from the tip tree and commit:

4504b5c9414c ("kvm: x86: Add AVX512_4VNNIW and AVX512_4FMAPS support")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

diff --cc arch/x86/kvm/cpuid.c
index 0aefb626fa8f,25f0f15fab1a..000000000000
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@@ -16,6 -16,8 +16,7 @@@
#include <linux/export.h>
#include <linux/vmalloc.h>
#include <linux/uaccess.h>
+ #include <asm/processor.h>
-#include <asm/fpu/internal.h> /* For use_eager_fpu. Ugh! */
#include <asm/user.h>
#include <asm/fpu/xstate.h>
#include "cpuid.h"