On Mon, Oct 09, 2017 at 04:18:10PM -0700, Darren Hart wrote: > I'm not sure how we would deal with it in the trees. Best to note this during > the merge window - whichever goes in second. Test merge will identify the > merge > conflict, and we can include a note to Linus on the preference.
That sounds good, thanks!
