linux-kernel - Re: [GIT PULL] KVM patches for Linux 5.4-rc8

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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Tue, 12 Nov 2019 22:33:12 +0100
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Radim Krčmář <rkrcmar@...hat.com>,
        KVM list <kvm@...r.kernel.org>
Subject: Re: [GIT PULL] KVM patches for Linux 5.4-rc8

On 12/11/19 22:26, Linus Torvalds wrote:
>> It's not a particularly hard conflict, but I'm including anyway a
>> resolution at the end of this email.
> Hmm. My resolution has a slightly different conflict diff, that shows
> another earlier part (that git ended up sorting out itself - maybe you
> edited it out for that reason).

Yes, I edited it out to point out the one that matters.  Sorry for the
confusion.

Paolo

> I think I did the right conflict resolution, but the difference in
> diffs makes me just slightly nervous. Mind checking it?