Messages in this thread | | | Date | Mon, 6 Aug 2018 15:21:00 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/vmx.c
between a series of commits in Linus' tree and a series of commits in the kvm tree.
I have no idea how to fix all this up, so I just dropped all the changes from Linus' tree (all those commits only touched this file). Please do this merge your self or provide me (and Linus) with the necessary resolution.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |