Re: linux-next: manual merge of the rr tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Rusty Russell <rusty@xxxxxxxxxxxxxxx> wrote:

> On Monday 05 January 2009 23:17:45 Ingo Molnar wrote:
> > That would allow Mike, Christoph and you to work this out cleanly from 
> > scratch. It would also solve your merge conflict.
> > 
> > Does that sound like a good solution?
> 
> Sure, but it won't make this window.  I guess since those patches don't 
> do anything but lay groundwork it's not critical, but annoying they've 
> lain fallow so long.
> 
> I'm happy to put them with the cpualloc patches, since they're related 
> and going to conflict, but I still want to see if Mike has the rest of 
> them?

ok, i've zapped them from tip/core/percpu and will let you and Mike handle 
them.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux