Re: [GIT PULL] ext4 update


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 <[email protected]>
	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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Follow-Ups:
- Re: [GIT PULL] ext4 update
  - From: Andrew Morton <[email protected]>
- Re: [GIT PULL] ext4 update
  - From: Theodore Tso <[email protected]>

References:
- [GIT PULL] ext4 update
  - From: "Theodore Ts'o" <[email protected]>

Prev by Date: Re: [PATCH] nfs: fix nfs_writepage()
Next by Date: Re: [PATCH 0/1] x86: Convert cpuinfo_x86 array to a per_cpu array v3
Previous by thread: Re: [GIT PULL] ext4 update
Next by thread: Re: [GIT PULL] ext4 update
Index(es):
- Date
- Thread

[Index of Archives] [Kernel Newbies] [Netfilter] [Bugtraq] [Photo] [Stuff] [Gimp] [Yosemite News] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Video 4 Linux] [Linux for the blind] [Linux Resources]