From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 890417CA0 for ; Thu, 10 Mar 2016 03:19:00 -0600 (CST) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 5C798304062 for ; Thu, 10 Mar 2016 01:19:00 -0800 (PST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by cuda.sgi.com with ESMTP id eyTnzh2ElR4FB3Y5 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 10 Mar 2016 01:18:56 -0800 (PST) Date: Thu, 10 Mar 2016 10:19:14 +0100 From: Jan Kara Subject: Re: linux-next: manual merge of the xfs tree with the ext4 tree Message-ID: <20160310091914.GD5026@quack.suse.cz> References: <20160310104100.6f906679@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160310104100.6f906679@canb.auug.org.au> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Stephen Rothwell Cc: Jan Kara , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, xfs@oss.sgi.com On Thu 10-03-16 10:41:00, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xfs tree got a conflict in: > > fs/ext4/ext4.h > > 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! This merge looks correct as well. Honza -- Jan Kara SUSE Labs, CR _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs