[lkml]   [2014]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the renesas tree with the arm-soc tree
Hi Olof,

On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson <> 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 :-)

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-01-04 13:21    [W:0.087 / U:0.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site