From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pekka Enberg Subject: Re: linux-next: manual merge of the kmemcheck tree Date: Wed, 13 Aug 2008 10:31:37 +0300 Message-ID: <48A28DD9.7010108@cs.helsinki.fi> References: <20080813152907.b76a06e3.sfr@canb.auug.org.au> <20080813073205.GA398@elte.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from courier.cs.helsinki.fi ([128.214.9.1]:37028 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752026AbYHMHfJ (ORCPT ); Wed, 13 Aug 2008 03:35:09 -0400 In-Reply-To: <20080813073205.GA398@elte.hu> Sender: linux-next-owner@vger.kernel.org List-ID: To: Ingo Molnar Cc: Stephen Rothwell , Vegard Nossum , linux-next@vger.kernel.org, Eduard - Gabriel Munteanu , Christoph Lameter Ingo Molnar wrote: > * Stephen Rothwell wrote: > >> Hi all, >> >> Today's linux-next merge of the kmemcheck tree got a conflict in >> mm/slab.c between commit fccd5095804ffc190cb2371c319cb4f5b2c0ee14 >> ("kmemtrace: SLAB hooks") from the slab tree and commit >> 30532cb3c49a2a9fed94127aab26003c52398a51 ("slab: add hooks for >> kmemcheck") from the kmemcheck tree. >> >> Simply overlapping additions of includes. > > thanks Stephen! I suspect these resolutions will live in linux-next for > the next 2 months, as that's the soonest there will be a natural merge > between slab.git and tip/kmemcheck. Oh, I was just asking Stephen what to do with those. If the resolutions can be in linux-next, I'm fine with that.