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

Message-ID: <20200310190205.7c152ef9@canb.auug.org.au>
Date:   Tue, 10 Mar 2020 19:02:05 +1100
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: linux-next: manual merge of the akpm-current tree with the vhost
 tree

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/virtio/virtio_balloon.c

between commit:

  b5769cdc14fc ("virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM")

from the vhost tree and commits:

  b64c4d5bea98 ("virtio-balloon: pull page poisoning config out of free page hinting")
  80c03575431c ("virtio-balloon: add support for providing free page reports to host")

from the akpm-current tree.

I looked at the conflict for a while but could not easily see how to
reconcile it, so I decided to revert the vhost tree commit for today.
Some advice would be appreciated.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped