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
-