On Fri, 29 Feb 2008 10:43:33 -0500
Theodore Tso [off-list ref] wrote:

Although I've checked to make sure that each of these topic branches
passes "make check" on their own, the combined pu branch is failing
due to what appears to be unfortunate interactions between js/flex-bg
and js/uninit.  This *may* be because I botched the merge, which got
tricky when I merged in js/uninit into the pu branch which already had
js/flex-bg.  If someone could take a look at the misc/mke2fs.c changes
in "git show bffaaf74", I'd much appreciate it.

The misc/mke2fs.c changes look sane to me.

* js/flex-bg (Wed Feb 13 20:47:50 2008 -0600) 1 commit
 - e2fsprogs: New bitmap and inode table allocation for FLEX_BG v2

	I've noticed that this patch is slightly different from what
	Jose sent in for the e2fsprogs-interim branch, so I'm a little
	concerned about which is the latest, or whether the
	differences are intentional.  Jose, if you have time, could
	you take a look at commits cb676995 and 8072fe6 and perhaps comment?

There where slight differences in misc/mke2fs.c that required making a
different patch for the e2fsprogs-interim branch.  The patches are
functionally the same.

-JRS