linux-kernel - Re: linux-next: manual merge of the vhost tree with the kbuild 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: <20170328150058.394e4c5a@canb.auug.org.au>
Date:   Tue, 28 Mar 2017 15:00:58 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Nicolas Dichtel <nicolas.dichtel@...nd.com>
Subject: Re: linux-next: manual merge of the vhost tree with the kbuild tree

Hi Michael,

On Tue, 28 Mar 2017 14:57:23 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
> 
>   include/uapi/linux/Kbuild
> 
> between commit:
> 
>   65017bab8a9e ("uapi: export all headers under uapi directories")
> 
> from the kbuild tree and commit:
> 
>   80363894995b ("virtio_mmio: expose header to userspace")
> 
> from the vhost tree.

In fact, the vhost tree should be cleaned up as that patch has been
committed to Linus's tree as a different commit.

-- 
Cheers,
Stephen Rothwell