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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1225911578.6333.7.camel@mingming-laptop>
Date:	Wed, 05 Nov 2008 10:59:38 -0800
From:	Mingming Cao <cmm@...ibm.com>
To:	Theodore Tso <tytso@....edu>
Cc:	Andrew Morton <akpm@...ux-foundation.org>, Jan Kara <jack@...e.cz>,
	linux-ext4@...r.kernel.org
Subject: Re: Patch collision: 64-bit quota changes and ext4 delalloc quota
	changs


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


--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html