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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <b75a43e2-1546-3956-361f-f72e76b54f3d@redhat.com>
Date:   Wed, 24 Oct 2018 23:44:43 +0200
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     Radim Krčmář <rkrcmar@...hat.com>,
        Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     linux-kernel@...r.kernel.org, kvm@...r.kernel.org
Subject: Re: [GIT PULL] KVM updates for Linux 4.20-rc1

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