Re: [GIT PULL] ext4 update

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Theodore Ts'o <tytso@...>
Cc: <linux-ext4@...>, <linux-kernel@...>
Date: Wednesday, October 17, 2007 - 11:59 am

On Wed, 17 Oct 2007, Theodore Ts'o wrote:

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.

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?

		Linus
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT PULL] ext4 update, Theodore Ts'o, (Wed Oct 17, 12:26 am)
Re: [GIT PULL] ext4 update, Linus Torvalds, (Wed Oct 17, 11:59 am)
Re: [GIT PULL] ext4 update, Andrew Morton, (Thu Oct 25, 7:31 pm)
Re: [GIT PULL] ext4 update, Linus Torvalds, (Thu Oct 25, 7:44 pm)
Re: [GIT PULL] ext4 update, Andrew Morton, (Thu Oct 25, 7:53 pm)
Re: [GIT PULL] ext4 update, Theodore Tso, (Wed Oct 17, 6:55 pm)
Re: [GIT PULL] ext4 update, , (Wed Oct 17, 12:51 am)
Re: [GIT PULL] ext4 update, Andreas Dilger, (Thu Oct 18, 2:29 am)