From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Mackall Subject: Re: linux-next: manual merge of the slab tree with the ftrace tree Date: Tue, 20 Jan 2009 00:01:44 -0600 Message-ID: <1232431304.5202.126.camel@calx> References: <20090120145759.e707b9de.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from waste.org ([66.93.16.53]:54020 "EHLO waste.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751841AbZATGC5 (ORCPT ); Tue, 20 Jan 2009 01:02:57 -0500 In-Reply-To: <20090120145759.e707b9de.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Pekka Enberg , Christoph Lameter , linux-next@vger.kernel.org, "=?ISO-8859-1?Q?=22Am=E9rico?= Wang\"" , Eduard - Gabriel Munteanu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" On Tue, 2009-01-20 at 14:57 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the slab tree got a conflict in mm/slob.c > between commit 3eae2cb24a96509e0a38cc48dc1538a2826f4e33 ("kmemtrace: SLOB > hooks") from the ftrace tree and commit > 6e9ed0cc4b963fde66ab47d9fb19147631e44555 ("slob: clean up the code") from > the slab tree. > > I fixed it up (see below) and can carry the fix as necessary. Looks good, thanks Stephen. -- http://selenic.com : development and support for Mercurial and Linux