linux-next: manual merge of the kvm tree with Linus' tree

From: Stephen Rothwell
Date: Mon Aug 06 2018 - 01:21:15 EST

Hi all,

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


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

Stephen Rothwell

Attachment: pgpWJ8kFoNQFs.pgp
Description: OpenPGP digital signature