> > OK, so that means I should send my pull request after yours in the next
> > merge window? To avoid the build breakage?
> 
> Either that or you can apply my patch on your tree before the
> patch that caused the breakage. 
> 
> Just let me know what works best for you.

Hmm, the offending patch is already in -next and I don't rebase my tree.
So, I guess it's the merge window dependency then.