Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757725AbYFHVxm (ORCPT ); Sun, 8 Jun 2008 17:53:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756403AbYFHVxe (ORCPT ); Sun, 8 Jun 2008 17:53:34 -0400 Received: from saeurebad.de ([85.214.36.134]:33038 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756297AbYFHVxe (ORCPT ); Sun, 8 Jun 2008 17:53:34 -0400 From: Johannes Weiner To: Andrew Morton Cc: Ingo Molnar , Yinghai Lu , Andi Kleen , Yasunori Goto , linux-kernel@vger.kernel.org Subject: Re: [PATCH -mm 00/14] bootmem rewrite v4 References: <20080605224940.434439989@saeurebad.de> <20080608133447.e5293600.akpm@linux-foundation.org> Date: Sun, 08 Jun 2008 23:52:47 +0200 In-Reply-To: <20080608133447.e5293600.akpm@linux-foundation.org> (Andrew Morton's message of "Sun, 8 Jun 2008 13:34:47 -0700") Message-ID: <87fxrnmw5s.fsf@saeurebad.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.1.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 827 Lines: 27 Hi, Andrew Morton writes: > On Fri, 06 Jun 2008 00:49:40 +0200 Johannes Weiner wrote: > >> This is a complete overhaul of the bootmem allocator while preserving >> most of its original functionality. > > Confused. This conflicts with patches from yourself which I have already > merged. Hum. I just tried again: - checkout v2.6.26-rc5 - get latest mmotm broken-out tarball (stamp-2008-06-07-02-27) - git-quiltimport - apply the bootmem series and no conflicts. Anything I missed? Which files are conflicting, btw? Hannes -- 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/