Re: linux-next: manual merge of the tip tree with Linus' tree

[Ingo Molnar]

* Will Deacon <will.deacon@xxxxxxx> wrote:

> For the sake of avoiding the conflict, can we just drop it for now, please?

Yeah, so I resolved the conflict by merging the (already upstream) bits and Linus 
pulled that resolution. From now on the level of comments you want there is up to 
you! :-)

Thanks,

	Ingo