Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762440AbXJYXyS (ORCPT ); Thu, 25 Oct 2007 19:54:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754994AbXJYXyE (ORCPT ); Thu, 25 Oct 2007 19:54:04 -0400 Received: from smtp2.linux-foundation.org ([207.189.120.14]:55106 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754818AbXJYXyB (ORCPT ); Thu, 25 Oct 2007 19:54:01 -0400 Date: Thu, 25 Oct 2007 16:53:58 -0700 From: Andrew Morton To: Linus Torvalds Cc: tytso@mit.edu, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] ext4 update Message-Id: <20071025165358.c408314d.akpm@linux-foundation.org> In-Reply-To: References: <20071025163113.491a4461.akpm@linux-foundation.org> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1310 Lines: 32 On Thu, 25 Oct 2007 16:44:21 -0700 (PDT) Linus Torvalds wrote: > > > On Thu, 25 Oct 2007, Andrew Morton wrote: > > > > There shouldn't have been conflicts here - if there were I wouldn't have > > sent those patches. Unless there were things in the ext4 pull which > > weren't present in the ext4 quilt tree which I included in 2.6.23-mm1? > > Well, you merge your patch-series by patching. > > You should have noticed by now that GNU patch in particular will happily > apply a patch whether it conflicts or not. So it's entirely possible that > it didn't conflict for you, but applied cleanly and sanely. > hrm, could be. It would be strange for that to happen quietly with fuzz=1 and to still produce a compileable result. But there weren't any patches in this git-merge which weren't in 2.6.23-mm1 so maybe something like that happened. Or maybe that fact that this pull only contained _some_ of the ext4 patches which were in -mm somehow affected things. Oh well, I should have sent the ext4 changes via Ted anyway. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/