On Mon, 13 Apr 2015 11:17:17 +0300 Emmanuel Grumbach <egrumbach@xxxxxxxxx> wrote: > I overthought it. Stephen fixed the conflict correctly. > Good, because I needed that change in my tree as other patches depended on it. Linus should be able to figure this out. I'll have to write up a bit for him when I do my pull request, as my own branches have minor conflicts. Linus doesn't mind conflicts, but if you are aware of them, and already did the merge fix, he likes to know about it, and pointers to the conflict resolution is helpful, as he can compare what he did to what we did. I'll make note of the merge conflict resolution commit that Stephen did in my pull request. -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
