lkml.org 
[lkml]   [2018]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [GIT PULL] KVM updates for Linux 4.20-rc1
From
Date
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

\
 
 \ /
  Last update: 2018-10-24 23:45    [W:0.046 / U:11.520 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site