lkml.org 
[lkml]   [2016]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm-current tree with the vhost tree
Hi Andrew,

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

mm/balloon_compaction.c

between commit:

0b5ffdb4f7c6 ("balloon: fix page list locking")

from the vhost tree and commit:

0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")

from the akpm-current tree.

I fixed it up (I think that the former is a superset of the latter, so
I used that, completely reversing the latter patch) and can carry the
fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

\
 
 \ /
  Last update: 2016-01-08 07:41    [W:0.053 / U:1.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site