From: Simon Horman <horms@verge.net.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Boris BREZILLON <b.brezillon@overkiz.com>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
Mike Turquette <mturquette@linaro.org>
Subject: Re: linux-next: manual merge of the renesas tree with the arm-soc tree
Date: Sun, 5 Jan 2014 14:54:09 +0900 [thread overview]
Message-ID: <20140105055407.GC5150@verge.net.au> (raw)
In-Reply-To: <20140104224346.c0f1689a8c7c62d4ee22aa3b@canb.auug.org.au>
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@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.
WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the renesas tree with the arm-soc tree
Date: Sun, 5 Jan 2014 14:54:09 +0900 [thread overview]
Message-ID: <20140105055407.GC5150@verge.net.au> (raw)
In-Reply-To: <20140104224346.c0f1689a8c7c62d4ee22aa3b@canb.auug.org.au>
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@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.
next prev parent reply other threads:[~2014-01-05 5:54 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-15 23:47 linux-next: manual merge of the renesas tree with the arm-soc tree Stephen Rothwell
2013-12-15 23:47 ` Stephen Rothwell
2013-12-15 23:47 ` Stephen Rothwell
2013-12-16 10:00 ` Nicolas Ferre
2013-12-16 10:00 ` Nicolas Ferre
2013-12-16 10:00 ` Nicolas Ferre
2013-12-17 0:19 ` Simon Horman
2013-12-17 0:19 ` Simon Horman
2014-01-04 5:11 ` Olof Johansson
2014-01-04 5:11 ` Olof Johansson
2014-01-04 11:43 ` Stephen Rothwell
2014-01-04 11:43 ` Stephen Rothwell
2014-01-05 5:54 ` Simon Horman [this message]
2014-01-05 5:54 ` Simon Horman
2014-01-06 9:44 ` Nicolas Ferre
2014-01-06 9:44 ` Nicolas Ferre
2014-01-08 16:56 ` Mike Turquette
2014-01-08 16:56 ` Mike Turquette
-- strict thread matches above, loose matches on Subject: below --
2016-02-24 22:07 Stephen Rothwell
2016-02-24 22:07 ` Stephen Rothwell
2016-02-24 22:07 ` Stephen Rothwell
2015-12-02 11:21 Mark Brown
2015-12-02 11:21 ` Mark Brown
2015-12-02 11:35 ` Arnd Bergmann
2015-12-02 11:35 ` Arnd Bergmann
2015-07-26 23:32 Stephen Rothwell
2015-07-26 23:32 ` Stephen Rothwell
2015-07-26 23:32 ` Stephen Rothwell
2015-07-26 23:27 Stephen Rothwell
2015-07-26 23:27 ` Stephen Rothwell
2015-07-26 23:27 ` Stephen Rothwell
2015-01-15 0:38 Stephen Rothwell
2015-01-15 0:38 ` Stephen Rothwell
2015-01-15 0:38 ` Stephen Rothwell
2015-01-15 8:44 ` Geert Uytterhoeven
2015-01-15 8:44 ` Geert Uytterhoeven
2014-05-22 2:12 Stephen Rothwell
2014-05-22 2:12 ` Stephen Rothwell
2014-05-22 2:12 ` Stephen Rothwell
2013-04-19 6:59 Stephen Rothwell
2013-04-19 6:59 ` Stephen Rothwell
2013-04-19 6:59 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140105055407.GC5150@verge.net.au \
--to=horms@verge.net.au \
--cc=arnd@arndb.de \
--cc=b.brezillon@overkiz.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=nicolas.ferre@atmel.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.