lkml.org 
[lkml]   [2008]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for April 9

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@elte.hu> 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.

Ingo


\
 
 \ /
  Last update: 2008-04-10 11:51    [W:0.075 / U:0.684 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site