From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ananth N Mavinakayanahalli Subject: Re: linux-next: manual merge of the tests tree Date: Wed, 15 Oct 2008 19:45:54 +0530 Message-ID: <20081015141554.GA24141@in.ibm.com> References: <20081015170503.1130c183.sfr@canb.auug.org.au> Reply-To: ananth@in.ibm.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from e34.co.us.ibm.com ([32.97.110.152]:54825 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754829AbYJOOQ1 (ORCPT ); Wed, 15 Oct 2008 10:16:27 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e34.co.us.ibm.com (8.13.8/8.13.8) with ESMTP id m9FEGOQZ027879 for ; Wed, 15 Oct 2008 10:16:24 -0400 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id m9FEGLE6209924 for ; Wed, 15 Oct 2008 08:16:22 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m9FEGBhm020956 for ; Wed, 15 Oct 2008 08:16:19 -0600 Content-Disposition: inline In-Reply-To: <20081015170503.1130c183.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Sam Ravnborg Cc: linux-next@vger.kernel.org On Wed, Oct 15, 2008 at 05:05:03PM +1100, Stephen Rothwell wrote: > Hi Ananth, > > Today's linux-next merge of the tests tree got a conflicts in lib/Kconfig.debug. > > You need to determine if this tree is ever going to be merged into Linus' > tree. I am going to drop it until you decide. Stephen, I am at a loss to determine the same. Sam Ravnborg had taken on the task to push it upstream and he has also tried a couple of times, without success. Sam? Ananth