From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751907AbcAHHis (ORCPT ); Fri, 8 Jan 2016 02:38:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44824 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750794AbcAHHir (ORCPT ); Fri, 8 Jan 2016 02:38:47 -0500 Date: Fri, 8 Jan 2016 09:38:43 +0200 From: "Michael S. Tsirkin" To: Minchan Kim Cc: Stephen Rothwell , Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the akpm-current tree with the vhost tree Message-ID: <20160108093621-mutt-send-email-mst@redhat.com> References: <20160108165908.2da89bfd@canb.auug.org.au> <20160108083449-mutt-send-email-mst@redhat.com> <20160108071706.GA9692@bbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160108071706.GA9692@bbox> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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