From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: Re: linux-next: manual merge of the xfs tree with the ext4 tree Date: Thu, 10 Mar 2016 10:18:40 +0100 Message-ID: <20160310091840.GC5026@quack.suse.cz> References: <20160310104056.78033e72@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx2.suse.de ([195.135.220.15]:50167 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935198AbcCJJSU (ORCPT ); Thu, 10 Mar 2016 04:18:20 -0500 Content-Disposition: inline In-Reply-To: <20160310104056.78033e72@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Chinner , xfs@oss.sgi.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara On Thu 10-03-16 10:40:56, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xfs tree got a conflict in: > > fs/ext4/inode.c > > between commit: > > 109811c20fb8 ("ext4: simplify io_end handling for AIO DIO") > > from the ext4 tree and commit: > > 74c66bcb7eda ("ext4: Fix data exposure after failed AIO DIO") > > from the xfs tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks. The merge looks correct. Honza -- Jan Kara SUSE Labs, CR