Re: linux-next: manual merge of the renesas tree with the arm-soctree

From: Simon Horman
Date: Sun Jan 05 2014 - 00:54:44 EST

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 <olof@xxxxxxxxx> 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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at