From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933244Ab1IOLFh (ORCPT ); Thu, 15 Sep 2011 07:05:37 -0400 Received: from 173-166-109-252-newengland.hfc.comcastbusiness.net ([173.166.109.252]:35383 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933075Ab1IOLFg (ORCPT ); Thu, 15 Sep 2011 07:05:36 -0400 Date: Thu, 15 Sep 2011 07:05:27 -0400 From: Christoph Hellwig To: Stephen Rothwell Cc: David Chinner , xfs-masters@oss.sgi.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: Re: linux-next: manual merge of the xfs tree with Linus' tree Message-ID: <20110915110527.GA5955@infradead.org> References: <20110915123031.104554f51c7642451fc31434@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110915123031.104554f51c7642451fc31434@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 15, 2011 at 12:30:31PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xfs tree got a conflict in > fs/xfs/xfs_aops.c between commit 2d2422aebc03 ("xfs: fix a use after free > in xfs_end_io_direct_write") from Linus' tree and commit a826361aa4af > ("xfs: defer AIO/DIO completions") from the xfs tree. > > The latter moves this code to another function (better solution?), so I > used the latter version. Yes, the mainline version is a quick fix for the use after free, the linux-next version fixes this by changing the broader scope.