Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754624AbZFPFso (ORCPT ); Tue, 16 Jun 2009 01:48:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751547AbZFPFsi (ORCPT ); Tue, 16 Jun 2009 01:48:38 -0400 Received: from courier.cs.helsinki.fi ([128.214.9.1]:50552 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281AbZFPFsh (ORCPT ); Tue, 16 Jun 2009 01:48:37 -0400 Subject: Re: linux-next: manual merge of the tip tree with the slab tree From: Pekka Enberg To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Piggin , Christoph Lameter , Vegard Nossum In-Reply-To: <20090616154652.b8adcb9d.sfr@canb.auug.org.au> References: <20090616154652.b8adcb9d.sfr@canb.auug.org.au> Date: Tue, 16 Jun 2009 08:48:38 +0300 Message-Id: <1245131318.3415.1.camel@penberg-laptop> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-Mailer: Evolution 2.24.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 710 Lines: 18 On Tue, 2009-06-16 at 15:46 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in mm/slub.c > between commit 964cf35c88f93b4927dbc4e950dfa4d880c7f9d1 ("SLUB: Fix early > boot GFP_DMA allocations") from the slab tree and commit > 18fd427debcf37c06917b55295df682fd05fee76 ("slub: add hooks for > kmemcheck") from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. Looks good! Thanks. -- 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/