Return-Path: <linux-kernel-owner+w=401wt.eu-S1761710AbXJYXb6@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1761710AbXJYXb6 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 25 Oct 2007 19:31:58 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757365AbXJYXbu
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 25 Oct 2007 19:31:50 -0400
Received: from smtp2.linux-foundation.org ([207.189.120.14]:52081 "EHLO
	smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756790AbXJYXbs (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 25 Oct 2007 19:31:48 -0400
Date: Thu, 25 Oct 2007 16:31:13 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: tytso@mit.edu, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] ext4 update
Message-Id: <20071025163113.491a4461.akpm@linux-foundation.org>
In-Reply-To: <alpine.LFD.0.999.0710170857490.26902@woody.linux-foundation.org>
References: <E1Ii0UI-0007TW-IM@closure.thunk.org>
	<alpine.LFD.0.999.0710170857490.26902@woody.linux-foundation.org>
X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1020
Lines: 30

On Wed, 17 Oct 2007 08:59:53 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Wed, 17 Oct 2007, Theodore Ts'o wrote:
> > 
> > Please pull from:
> > 
> >         git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
> 
> This conflicts in nontrivial ways with
> 
> 	commit 7c9e69faa28027913ee059c285a5ea8382e24b5d
> 	Author: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> 	Date:   Tue Oct 16 23:27:02 2007 -0700
> 
> 	    ext2/ext3/ext4: add block bitmap validation
> 
> which I just merged from -mm.

<catching up>

There shouldn't have been conflicts here - if there were I wouldn't have
sent those patches.  Unless there were things in the ext4 pull which
weren't present in the ext4 quilt tree which I included in 2.6.23-mm1?

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/