linux-kernel - Re: linux-next: manual merge of the vhost tree with the kvm-arm 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: <ca62a297-1834-ffcc-41ae-5cb3009e56b1@redhat.com>
Date:   Mon, 30 Mar 2020 15:08:16 +0800
From:   Jason Wang <jasowang@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "Michael S. Tsirkin" <mst@...hat.com>,
        Christoffer Dall <cdall@...columbia.edu>,
        Marc Zyngier <marc.zyngier@....com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the vhost tree with the kvm-arm tree


On 2020/3/30 下午1:57, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell<sfr@...b.auug.org.au>  wrote:
>> Today's linux-next merge of the vhost tree got a conflict in:
>>
>>    arch/arm/kvm/Kconfig
>>
>> between commit:
>>
>>    541ad0150ca4 ("arm: Remove 32bit KVM host support")
>>
>> from the kvm-arm tree and commit:
>>
>>    ec9d8449a99b ("vhost: refine vhost and vringh kconfig")
>>
>> from the vhost tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>                   ^^^^^^^^^
> I just removed the file, of course.


Hi Stephen:

If you meant arch/arm/kvm/Kconfig I think it's correct.

Thakns