From mboxrd@z Thu Jan  1 00:00:00 1970
From: tytso@mit.edu
Subject: Re: linux-next: manual merge of the trivial tree with the ext4 tree
Date: Wed, 25 Nov 2009 06:45:22 -0500
Message-ID: <20091125114522.GD14289@thunk.org>
References: <20091125183414.eb45acca.sfr@canb.auug.org.au>
 <alpine.LSU.2.00.0911251216270.6953@wotan.suse.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S1758756AbZKYLp2@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <alpine.LSU.2.00.0911251216270.6953@wotan.suse.de>
Sender: linux-kernel-owner@vger.kernel.org
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
List-Id: linux-next.vger.kernel.org

On Wed, Nov 25, 2009 at 12:16:43PM +0100, Jiri Kosina wrote:
> On Wed, 25 Nov 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the trivial tree got a conflict in
> > fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
> > ("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
> > tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
> > some typos and punctuation in comments") from the trivial tree.
> > 
> > The former moved the comment fixed by the latter and fixed the typo along
> > the way.
> 
> Dropped the mballoc hunk from my queue, thanks.

You mean balloc hunk, I hope.  (In the commit in question, I moved the
comment from fs/ext4/balloc.c to fs/ext4/mballoc.c.)

						- Ted