Re: linux-next: Tree for April 9

[Ingo Molnar]

* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@xxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/