Hi all,
Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kvm/x86.c between commit c447e76b4cab ("kvm/fpu: Enable eager
restore kvm FPU for MPX") from the tree and commit 653f52c316a4
("kvm,x86: load guest FPU context more eagerly") from the kvm tree.
I fixed it up (I used the version from the kvm tree) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpbnhTpY84bG.pgp
Description: OpenPGP digital signature
