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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200330165701.4e1b8039@canb.auug.org.au>
Date:   Mon, 30 Mar 2020 16:57:01 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "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>,
        Jason Wang <jasowang@...hat.com>
Subject: Re: linux-next: manual merge of the vhost tree with the kvm-arm
 tree

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped