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

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

 



* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi Ingo,
> 
> Today's linux-next merge of the sparseirq tree got a lot of conflicts 
> with various other trees.  For today, I will drop it and maybe have 
> another look tomorrow when things are (hopefully) less busy. [...]

okay, agreed - i've just reset auto-sparseirq-next to Linus and will 
update it with a merged up tree. (which we have in the works)

> [...] If you could fix up any internal-to-tip and Linus conflicts, 
> that would be great.

no other topic should be conflicting that i know of.

	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