From mboxrd@z Thu Jan  1 00:00:00 1970
From: Theodore Tso <tytso@mit.edu>
Subject: Re: [GIT PULL] ext4 update
Date: Wed, 17 Oct 2007 18:55:19 -0400
Message-ID: <20071017225519.GA11267@thunk.org>
References: <E1Ii0UI-0007TW-IM@closure.thunk.org> <alpine.LFD.0.999.0710170857490.26902@woody.linux-foundation.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
To: Linus Torvalds <torvalds@linux-foundation.org>
Return-path: <linux-ext4-owner@vger.kernel.org>
Received: from thunk.org ([69.25.196.29]:38093 "EHLO thunker.thunk.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1759256AbXJQWz1 (ORCPT <rfc822;linux-ext4@vger.kernel.org>);
	Wed, 17 Oct 2007 18:55:27 -0400
Content-Disposition: inline
In-Reply-To: <alpine.LFD.0.999.0710170857490.26902@woody.linux-foundation.org>
Sender: linux-ext4-owner@vger.kernel.org
List-Id: linux-ext4.vger.kernel.org

On Wed, Oct 17, 2007 at 08:59:53AM -0700, Linus Torvalds wrote:
> > Please pull from:
> > 
> >         git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
> 
> This conflicts in nontrivial ways with
> 
> which I just merged from -mm.
> 
> I suspect it's trivial to fix up for somebody who knows/understands the 
> code, but I'm not that person, and I cannot verify the end result.
> 
> So can you please do the merge, and I'll pull the merged tree?
> 

OK, I've rebased and fixed up the patches with your latest git tree.

Could you please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

now?   Thanks!!

						- Ted