linux-next: manual merge of the akpm-current tree with the vhost tree

[Stephen Rothwell]

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

Attachment: pgpsYYVxI3QPu.pgp
Description: OpenPGP digital signature