From: "Theodore Ts'o" <tytso@mit.edu>
Subject: Patch collision: 64-bit quota changes and ext4 delalloc quota changs
Date: Wed, 05 Nov 2008 11:09:39 -0500
Message-ID: <E1Kxkwt-0007Np-O4@closure.thunk.org>
Cc: linux-ext4@vger.kernel.org
To: akpm@linux-foundation.org, Jan Kara <jack@suse.cz>,
	Mingming Cao <cmm@us.ibm.com>
Sender: linux-ext4-owner@vger.kernel.org

Hi,

Mingming has been working on some changes to support better support
quotas when ext4's delayed allocation is enabled.  Unfortunately, they
conflict with Jan's 64-bit quota changes.  The first two patches in
mingming's series change core quota handling code; the last one is ext4
specific.

Andrew has commented on the patches and I assume Mingming will be
addressing his comments.  In the meantime, there is the question of
where the patches should live while they cook.

Mingming has dropped her patches, followed by Jan's 64-bit quota
patches, into the ext4 patch queue tree.  This was for her convenience,
and also so she could modify Jan's patches so they would apply after
making the changes she needed.  That makes sense, but it means that we
have the quota patches in the ext4 tree, which isn't so great,
especially if Jan wants/needs/plans to make any further changes.

Andrew has I see sucked up the Mingming's quota changes into the mm
tree.  Given that 2 out of the 3 patches affect core code, that also
makes sense, although the last patch is ext4 specific, and some changes
to that patch might be needed as we make other changes to ext4.  (For
example, my latest patch to reduce stack space on x86_64 systems by
fixing inappropriate use of "unsigned long" required some minor fix ups
to Mingming's last patch.

So what to do...  I *think* the thing which makes the most sense is for
me to drop all of the quota related changes from the ext4 patch queue,
since in reality 95% of the changes are are all outside of the ext4
tree, and let Andrew carry the changes in -mm.  Mingming, if you like we
can save the patches off to a subdirectory in the ext4 patch queue, and
make it easier for you to do your development.

Does that make sense to everyone?

						- Ted