From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758128Ab0E0Pxa (ORCPT ); Thu, 27 May 2010 11:53:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56769 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755512Ab0E0Px1 (ORCPT ); Thu, 27 May 2010 11:53:27 -0400 Date: Tue, 25 May 2010 23:55:52 +0200 From: Jan Kara To: Stephen Rothwell Cc: Jan Kara , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Al Viro Subject: Re: linux-next: manual merge of the ext3 tree with Linus' tree Message-ID: <20100525215552.GA12633@quack.suse.cz> References: <20100522154532.bc0f8008.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100522154532.bc0f8008.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Sat 22-05-10 15:45:32, Stephen Rothwell wrote: > Today's linux-next merge of the ext3 tree got a conflict in fs/super.c > between commits b20bd1a5e78af267dc4b6e1ffed48d5d776302c5 ("get rid of > S_BIAS"), 1712ac8fda7d8bc4dc921f5777b7423aacad7263 ("Saner locking around > deactivate_super()") and e1e46bf1866317d4f86f66bf18d3f07317d9f9ee ("Trim > includes in fs/super.c") from Linus' tree and commits > c3134141c78d5ea233a08b703b553e70cfb5c585 ("quota: move unmount handling > into the filesystem") and cdb89ca659f5a39edf88f3c55e545ea3347533d1 > ("quota: explicitly set ->dq_op and ->s_qcop") from the ext3 tree. Thanks! I've now rebased for_next branch on recent Linus's tree and so this conflict should go away. Honza -- Jan Kara SUSE Labs, CR