All of lore.kernel.org
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request: u-boot-sh/rmobile into u-boot-arm/master
Date: Fri, 16 May 2014 20:41:19 +0200	[thread overview]
Message-ID: <E1WlN4L-0001yE-3z@janus> (raw)
In-Reply-To: <E1WlKRm-0001Ck-Hy@janus>

Hi Albert,

On Fri, 16 May 2014 17:53:21 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Albert,
> 
> On Fri, 16 May 2014 17:22:41 +0200, Albert ARIBAUD
> <albert.u.boot@aribaud.net> wrote:
> 
> > Hi Nobuhiro,
> > 
> > On Fri, 16 May 2014 11:14:26 +0900, Nobuhiro Iwamatsu
> > <iwamatsu@nigauri.org> wrote:
> > 
> > > Hi, Albert.
> > > 
> > > Could you apply this PR?
> > 
> > Sorry, for some reason it was off my radar. Will apply it along with
> > the pending ones.
> 
> Hmm, there's a merge conflict in boards.cfg whereby the same board is 
> asigned to two different maintainers:
> 
> > <<<<<<< HEAD
> > Active arm armv7 rmobile renesas lager lager_nor lager:NORFLASH Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> 
> > Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak <p.marczak@samsung.com> 
> > =======
> > Active arm armv7 s5pc1xx samsung goni s5p_goni - Mateusz Zalega <m.zalega@samsung.com>
> >>>>>>> u-boot-sh/rmobile
> 
> Which one am I supposed to keep? Or both?

Ok, got it (commit bfbc47cc9fc)
 
> Amicalement,

Amicalement,
-- 
Albert.

  reply	other threads:[~2014-05-16 18:41 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-01 20:14 [U-Boot] Pull request: u-boot-sh/rmobile into u-boot-arm/master Nobuhiro Iwamatsu
2014-05-16  2:14 ` Nobuhiro Iwamatsu
2014-05-16 15:22   ` Albert ARIBAUD
2014-05-16 15:53     ` Albert ARIBAUD
2014-05-16 18:41       ` Albert ARIBAUD [this message]
2014-05-16 20:35 ` Albert ARIBAUD
2014-05-19  0:38   ` Nobuhiro Iwamatsu
  -- strict thread matches above, loose matches on Subject: below --
2014-10-09  6:08 Nobuhiro Iwamatsu
2014-10-09  7:51 ` Albert ARIBAUD
2014-07-24  6:08 Nobuhiro Iwamatsu
2014-07-28 10:25 ` Albert ARIBAUD
2014-06-10  7:58 Nobuhiro Iwamatsu
2014-06-10  8:46 ` Albert ARIBAUD
2014-06-12  0:47   ` Nobuhiro Iwamatsu
2014-05-21  1:20 Nobuhiro Iwamatsu
2014-05-24  8:39 ` Albert ARIBAUD
2014-04-14  8:53 Nobuhiro Iwamatsu
2014-04-14 19:20 ` Tom Rini
2014-04-15  6:10   ` Nobuhiro Iwamatsu
2014-01-09  4:36 Nobuhiro Iwamatsu
2013-12-18  7:44 Nobuhiro Iwamatsu
2013-12-18 18:25 ` Albert ARIBAUD
2013-12-03  1:40 Nobuhiro Iwamatsu
2013-12-06 12:07 ` Albert ARIBAUD

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=E1WlN4L-0001yE-3z@janus \
    --to=albert.u.boot@aribaud.net \
    --cc=u-boot@lists.denx.de \
    /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.