* 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 -- 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