From: Andrew Morton Subject: Re: merge plans, was Re: - disable-ext4.patch removed from -mm tree Date: Mon, 4 Feb 2008 14:35:29 -0800 Message-ID: <20080204143529.7b99932d.akpm@linux-foundation.org> References: <200802032018.m13KIGoC029855@imap1.linux-foundation.org> <20080203122551.6830370a.akpm@linux-foundation.org> <20080204013626.GE18392@mit.edu> <20080203191540.3cb2660b.akpm@linux-foundation.org> <20080204202418.GA1649@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: tytso@mit.edu, dhowells@redhat.com, linux-ext4@vger.kernel.org To: Christoph Hellwig Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:50820 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757031AbYBDWhJ (ORCPT ); Mon, 4 Feb 2008 17:37:09 -0500 In-Reply-To: <20080204202418.GA1649@lst.de> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Mon, 4 Feb 2008 15:24:18 -0500 Christoph Hellwig wrote: > On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote: > > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso wrote: > > > > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote: > > > > When I merge David's iget coversion patches this will instead wreck the > > > > ext4 patchset. > > > > > > That's ok, it shouldn't be hard for me to fix this up. How quickly > > > will you be able to merge David's iget converstion patches? > > > > They're about 1,000 patches back > > Care to post a merge plan so we have a slight chance to make sure not > too much crap is hiding in these 1000 patches? Pretty much everything up to # # end # reiser4-sb_sync_inodes.patch