Re: linux-next: manual merge of the akpm-current tree with the vhost tree
From: Stephen Rothwell
Date: Fri Jan 08 2016 - 01:50:19 EST
On Fri, 8 Jan 2016 08:46:15 +0200 "Michael S. Tsirkin" <mst@xxxxxxxxxx> wrote:
> On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> > 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).
> Oops, it isn't.
> Andrew, your tree seems to still carry original patch by Minchan Kim:
> I reported on list that it has a deadlock:
> I think it should be reverted and my patch applied - it's in my tree
> but if you prefer it in yours instead, please let me know.
That is what I effectively did in today's tree.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx