From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756425AbYDJTC7 (ORCPT ); Thu, 10 Apr 2008 15:02:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752020AbYDJTCw (ORCPT ); Thu, 10 Apr 2008 15:02:52 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:51726 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752011AbYDJTCv (ORCPT ); Thu, 10 Apr 2008 15:02:51 -0400 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Thu, 10 Apr 2008 21:02:26 +0200 (CEST) From: Stefan Richter Subject: Re: linux-next: Tree for April 9 To: Ingo Molnar cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML In-Reply-To: <20080410094853.GA12543@elte.hu> Message-ID: References: <20080409185309.b94c9d15.sfr@canb.auug.org.au> <47FCF50E.9090703@s5r6.in-berlin.de> <20080410065227.GB30066@elte.hu> <20080410174418.ebfe76c3.sfr@canb.auug.org.au> <20080410094853.GA12543@elte.hu> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo Molnar wrote: > * Stephen Rothwell wrote: > >> On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar wrote: >> > >> > what type of conflict do you have there? If it's a new entry then >> > you might be able to fix it by moving the new entry elsewhere in the >> > file. Or if i introduced a new entry close to an existing entry you >> > modify then i could move my new entry elsewhere. >> >> Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: >> add option for remote debugging") in the ieee1394 tree adds a new >> entry just where the sched tree adds >> >> source kernel/trace/Kconfig > > hm, i think in this specific case the new firewire entry should be added > after the PROVIDE_OHCI1394_DMA_INIT section. (that's how we extend > groups of Kconfig entries anyway) The new trace entries in the scheduler > tree follow that pattern and add the new kernel/trace/Kconfig at the > right place. So if the firewire entry is added that way this conflict > could be avoided. Indeed, this order of the two options looks more logical now that you say it. Update patch will appear on LKML in a minute. Stephen will still have a conflict in lib/Kconfig.debug when merging the tests tree, but this happens regardless what we two do because tests is based on 2.6.25-rc1, and mainline Kconfig.debug has changes post -rc1. -- Stefan Richter -=====-==--- -=-- -=-=- http://arcgraph.de/sr/