Hi Peter, On Wed, 1 Nov 2017 09:55:24 +0100 Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote: > > Hmm, I thought having that same base patch in both trees would allow it > to resolve that conflict. A well.. There is a difference between having he same patch and the same commit ... -- Cheers, Stephen Rothwell -- 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
