Re: [GIT PULL] First batch of KVM changes for 4.7

[Linus Torvalds]

On Thu, May 19, 2016 at 5:17 AM, Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote:
>
>   git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus

This conflicted with the MIPS updates I just pulled.

I tried to fix things up, but since I don't cross-compile, my fixups
have no testing even at the "ok, it compiles, ship it" level.

Please double-check the end result and send me any correction patches
if necessary.

Thanks,

                Linus