From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753945AbcCUWlR (ORCPT ); Mon, 21 Mar 2016 18:41:17 -0400 Received: from ipmail04.adl6.internode.on.net ([150.101.137.141]:15408 "EHLO ipmail04.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751159AbcCUWlQ (ORCPT ); Mon, 21 Mar 2016 18:41:16 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CbCADed/BWNTGaLHlegzOBTYZmn0IBAQEGjAaFXoQNhgcCAgEBAoEvTQEBAQEBAQcBAQEBQUCEQgEBBDocIxAIAxgJJQ8FJQMHGhOIJr5gAQseGYU9hQyKEgEEl1eNeoFZFoRKiFiPBoRbKC6KBgEBAQ Date: Tue, 22 Mar 2016 09:40:57 +1100 From: Dave Chinner To: Linus Torvalds Cc: Andrew Morton , Linux Kernel Mailing List , xfs@oss.sgi.com, Jan Kara , "Theodore Ts'o" Subject: Re: [GIT PULL] xfs: updates for 4.6-rc1 Message-ID: <20160321224057.GO11812@dastard> References: <20160321020505.GJ11812@dastard> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 21, 2016 at 11:59:54AM -0700, Linus Torvalds wrote: > On Sun, Mar 20, 2016 at 7:05 PM, Dave Chinner wrote: > > > > There are conflicts with the ext4 code that has already been merged > > this cycle. > > The merge looked pretty straightforward, but both of you (ie both the > xfs and ext4 people, please) should check the end result please. > > My sanity-check is still building, but it should be all pushed out in > another 15 minutes or so. Merged XFS bits look fine, ext4 parts look ok according to Jan's last comments. Cheers, Dave. -- Dave Chinner david@fromorbit.com