For the sake of proper bisectability, this should go in after
Tejun's workqueue changes (if needed at all depending on how merge
happens during pull by Linus).
Yeah, we either can ask Linus to fix it up during merge or send a
separate patch afterwards. In this case, I don't think it matters too
much either way. I tend to send out pull request fairly early in the
merge window, I'll try to remember to poke Linus about the merge
Linus has just pulled from me, so if you could take care of this merge
conflict, that'd be awesome.