On Sat, Jan 04, 2014 at 10:43:46PM +1100, Stephen Rothwell wrote: > Hi Olof, > > On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson <o...@lixom.net> wrote: > > > > Now I can't resolve it properly and move the entries when I do the > > same merge (and get the same conflict), because that will cause a > > third conflict for Stephen, and he's about to return from vacation and > > is going to cuss at us if we cause too many new conflicts in one day. > > :) > > Since I have now been made aware of the issue, you might as well just > sort it in the merge. And I have never been known to "cuss", though > ranting is a possibility :-)
Rant accepted. I will be more careful in future. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
