linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the vhost 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: <20200407132521.656db6fa@canb.auug.org.au>
Date:   Tue, 7 Apr 2020 13:25:21 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        "Michael S. Tsirkin" <mst@...hat.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Hildenbrand <david@...hat.com>,
        Alexander Duyck <alexander.h.duyck@...ux.intel.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 vhost tree

Hi all,

On Mon, 30 Mar 2020 19:31:37 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   drivers/virtio/virtio_balloon.c
> 
> between commit:
> 
>   5a6b4cc5b7a1 ("virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM")
> 
> from the vhost tree and commits:
> 
>   5193acb63eef ("virtio-balloon: pull page poisoning config out of free page hinting")o
>   226d0484a676 ("virtio-balloon: add support for providing free page reports to host")
>   49006aae9e94 ("virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM")
> 
> from the akpm-current tree.
> 
> OK, this is such a mess that all I could do was to revert commit
> 5a6b4cc5b7a1 from the vhost tree and keep all the akpm-current tree
> patches. Please sort this out before Linus gets to see it.

I am still reverting that commit ...

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped