Re: Patch collision: 64-bit quota changes and ext4 delalloc quota changs

[Mingming Cao <cmm@us.ibm.com>]

On Wed, 2008-11-05 at 12:40 -0500, Theodore Tso wrote:
> On Wed, Nov 05, 2008 at 08:43:03AM -0800, Andrew Morton wrote:
> > 
> > It works for me.  I really need to get off my butt and get -mm into
> > linux-next.
> > 
> > I can merge ext4-quota-handling-for-delayed-allocation.patch if you
> > like, or you can merge it once te quota changes have gone in.
> > 
> 
> If you are willing to carry the
> ext4-quota-handling-for-delayed-allocation.patch, that would be great.
> 

I saw Andrew already picked up the ext4 quota changes. I will address
Andrew's comments soon. I assume I will working on incremental fixes to
address the comments? Or should I send new version of the series?

> Mingming, what I'll do is create a branch of the ext4 patch queue
> (since it's being maintained in git anyway), that basically reflects
> the patch queue as it currently exists today.  You can do your
> development in that branch so it won't impact you terribly, but I'll
> then set master branch of the ext4 patch queue to be a version that
> drops all of the quota related changes.  

Sure, that works for me. 


> But keeping this stuff all in -mm should work, although depending on
> how many more cleanup patches flow into ext4, this might cause some
> minor patch conflicts on that last quota dellaloc patch that actually
> touches ext4 core code.
> 

Since Andrew already picked up the ext4 quota changes, I will work
against mm tree then.


Mingming