From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752519AbbGWJjw (ORCPT ); Thu, 23 Jul 2015 05:39:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55663 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752903AbbGWJjf (ORCPT ); Thu, 23 Jul 2015 05:39:35 -0400 Date: Thu, 23 Jul 2015 11:39:27 +0200 From: Jan Kara To: Stephen Rothwell Cc: Andrew Morton , Jan Kara , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Dobriyan Subject: Re: linux-next: manual merge of the akpm-current tree with the FIXME tree Message-ID: <20150723093927.GA8686@quack.suse.cz> References: <20150723160048.01a283c5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150723160048.01a283c5@canb.auug.org.au> 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 Thu 23-07-15 16:00:48, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got conflicts in: > > fs/ext3/super.c > > between commit: > > 106542e7987c ("fs: Remove ext3 filesystem driver") > > from the FIXME tree and commit: > > d2c05ecd59bc ("parse_integer: convert ext2, ext3, ext4") > > from the akpm-current tree. > > I fixed it up (I just removed the file) and can carry the fix as necessary > (no action is required). > > Jan, I also removed the JBD section from the MAINTAINERS file ... your > version has conflict markers left around it ... Thanks Stephen. I have fixed up MAINTAINERS file in my tree (amended the original commit). Honza -- Jan Kara SUSE Labs, CR