lkml.org 
[lkml]   [2020]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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@canb.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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-04-07 05:26    [W:0.059 / U:1.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site