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

From	"Michael S. Tsirkin" <mst@redhat.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the akpm-current tree with the vhost tree
Date	2016-01-08 08:40 +0100
Message-ID	<qOzOp-3uw-1@gated-at.bofh.it> (permalink)
References	<qOyfE-2im-3@gated-at.bofh.it> <qOz22-2Tw-1@gated-at.bofh.it> <qOzv3-3m3-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, Jan 08, 2016 at 04:17:06PM +0900, Minchan Kim wrote:
> On Fri, Jan 08, 2016 at 08:46:15AM +0200, Michael S. Tsirkin wrote:
> > On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> > > 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).
> > 
> > Oops, it isn't.
> > 
> > Andrew, your tree seems to still carry original patch by Minchan Kim:
> > 
> > 0c983ec0c078ed5d5c219cf97af06364e7a8e19f
> > 
> > I reported on list that it has a deadlock:
> > http://article.gmane.org/gmane.linux.kernel.stable/159208
> 
> And I replied on your comment that it's not a deadlock but it seem
> you lost my mail because you didn't reply to me.
> Could you expalin why it's deadlock in my reply thread?

I missed your mail, sorry. I don't remember the details.  I'll think
about it some more and reply next week in any case.

Thanks!

-- 
MST

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with the vhost  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 07:00 +0100
  Re: linux-next: manual merge of the akpm-current tree with the vhost  tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 07:50 +0100
    Re: linux-next: manual merge of the akpm-current tree with the  vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 08:00 +0100
      Re: linux-next: manual merge of the akpm-current tree with the vhost  tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 08:10 +0100
        Re: linux-next: manual merge of the akpm-current tree with the  vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 08:30 +0100
    Re: linux-next: manual merge of the akpm-current tree with the vhost  tree Minchan Kim <minchan@kernel.org> - 2016-01-08 08:20 +0100
      Re: linux-next: manual merge of the akpm-current tree with the vhost  tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 08:40 +0100

csiph-web