linux-kernel - Re: linux-next: manual merge of the hyperv tree with the kvm tree

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]

Message-ID: <20200602162949.apy2lzpecyedqtiw@liuwe-devbox-debian-v2.j3c5onc20sse1dnehy4noqpfcg.zx.internal.cloudapp.net>
Date:   Tue, 2 Jun 2020 16:29:49 +0000
From:   Wei Liu <wei.liu@...nel.org>
To:     Paolo Bonzini <pbonzini@...hat.com>
Cc:     Wei Liu <wei.liu@...nel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        KVM <kvm@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jon Doron <arilou@...il.com>,
        Michael Kelley <mikelley@...rosoft.com>
Subject: Re: linux-next: manual merge of the hyperv tree with the kvm tree

On Tue, Jun 02, 2020 at 06:26:26PM +0200, Paolo Bonzini wrote:
> On 02/06/20 15:56, Wei Liu wrote:
> >>
> >> between commit:
> >>
> >>   22ad0026d097 ("x86/hyper-v: Add synthetic debugger definitions")
> >>
> > Paolo
> > 
> > As far as I can tell you merged that series a few days ago. Do you plan
> > to submit it to Linus in this merge window? How do you want to proceed
> > to fix the conflict?
> 
> Hi, Linus can fix this conflict.

OK. I will write down in my pull request what needs to be done to fix
the conflicts.

Wei.

> 
> Paolo
>