Re: [GIT PULL] KVM updates for Linux 4.20-rc1

From: Paolo Bonzini
Date: Wed Oct 24 2018 - 17:44:51 EST


On 24/10/2018 13:14, Radim KrÄmÃÅ wrote:
> Linus,
>
> there are conflicts with the ARM tree as we didn't have a topic branch and some
> with 4.19 fixes. Future merge of the selftests tree will also have a conflict,
> https://lkml.org/lkml/2018/10/18/273. All should be resolved as in next and
> a resolution of the first two is attached at the bottom.

FWIW, for the selftests tree you should just keep the version from the
KVM tree.

Thanks,

Paolo