From: Minkyu Kang <mk7.kang@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Please pull u-boot-samsung/master
Date: Fri, 25 Mar 2011 11:02:59 +0900 [thread overview]
Message-ID: <4D8BF7D3.3050007@samsung.com> (raw)
In-Reply-To: <4D8B4DB1.9080604@free.fr>
Dear Albert ARIBAUD,
2011-03-24 ?? 10:57, Albert ARIBAUD ? ?:
> Le 24/03/2011 07:58, Minkyu Kang a ?crit :
>> Dear Albert Aribaud,
>>
>> The following changes since commit 966a35d45b90fdcd694dec89b32e5b67771cfd64:
>>
>> Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-02-16 08:54:52 +0900)
>>
>> are available in the git repository at:
>>
>> git://git.denx.de/u-boot-samsung master
>
> This does not seem to have been rebased to u-boot or u-boot-arm. Can you
> check?
>
Two files are both modified.
board/samsung/smdk6400/u-boot-nand.lds
nand_spl/board/samsung/smdk6400/u-boot.lds
modified by commit id 79f062e749d9277f89686c3948520dd8d0aab501 on u-boot-arm,
commit id 9fc36d1b4492f792617f3947bdf8cea74f236139 and
4b7100ec4c1cedd968d3acab58de5f209b7c8bf7, 9e88e50216279f95d7a974ac0b60907fbee1a2d4
on u-boot-samsung.
Hm, how we can solve it?
If possible, could you please merge it manually?
Thanks
Minkyu Kang.
next prev parent reply other threads:[~2011-03-25 2:02 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-24 6:58 [U-Boot] Please pull u-boot-samsung/master Minkyu Kang
2011-03-24 13:57 ` Albert ARIBAUD
2011-03-25 2:02 ` Minkyu Kang [this message]
2011-03-25 7:23 ` Albert ARIBAUD
2011-03-25 9:59 ` Minkyu Kang
2011-03-26 14:59 ` Albert ARIBAUD
-- strict thread matches above, loose matches on Subject: below --
2012-06-18 8:50 [U-Boot] please " Minkyu Kang
2012-06-23 7:18 ` Albert ARIBAUD
2012-04-25 7:51 Minkyu Kang
2012-04-26 21:26 ` Albert ARIBAUD
2012-03-08 10:14 Minkyu Kang
2012-03-27 9:44 ` Minkyu Kang
2012-03-27 20:09 ` Albert ARIBAUD
2012-02-10 1:01 Minkyu Kang
2012-02-10 19:59 ` Albert ARIBAUD
2011-12-09 9:15 Minkyu Kang
2011-12-09 16:39 ` Albert ARIBAUD
2011-10-28 8:19 Minkyu Kang
2011-10-28 15:17 ` Albert ARIBAUD
2011-09-02 8:05 Minkyu Kang
2011-09-03 19:23 ` Albert ARIBAUD
2011-08-19 5:34 Minkyu Kang
2011-08-19 18:22 ` Albert ARIBAUD
2011-05-26 10:43 [U-Boot] Please " Minkyu Kang
2011-05-26 10:59 ` Albert ARIBAUD
2011-05-26 5:22 Minkyu Kang
2011-05-26 5:49 ` Albert ARIBAUD
2011-05-26 6:24 ` Minkyu Kang
2011-05-26 8:13 ` Albert ARIBAUD
2011-05-26 10:40 ` Minkyu Kang
2011-01-27 12:29 Minkyu Kang
2011-01-27 22:11 ` Albert ARIBAUD
2010-11-30 8:56 Minkyu Kang
2010-11-30 20:32 ` Wolfgang Denk
2010-10-28 7:29 Minkyu Kang
2010-10-29 19:48 ` Wolfgang Denk
2010-08-31 10:27 Minkyu Kang
2010-09-07 22:04 ` Wolfgang Denk
2010-08-03 7:54 Minkyu Kang
2010-08-03 22:35 ` Wolfgang Denk
2010-06-02 23:55 Minkyu Kang
2010-06-06 11:44 ` Tom Rix
2010-06-09 0:08 ` Minkyu Kang
2010-06-15 4:23 ` Tom Rix
2010-04-13 10:02 Minkyu Kang
2010-04-17 22:07 ` Tom Rix
2010-03-05 10:03 Minkyu Kang
2010-03-05 20:29 ` Tom
2010-03-08 6:08 ` Minkyu Kang
2010-03-12 19:43 ` Tom
2010-03-13 16:32 ` Tom
2010-01-13 4:25 Minkyu Kang
2010-01-15 13:28 ` Tom
2009-11-20 10:45 Minkyu Kang
2009-11-20 22:16 ` Tom
2009-10-12 7:38 Minkyu Kang
2009-10-12 11:16 ` Tom Rix
2009-10-14 3:31 ` Tom Rix
2009-10-14 10:16 ` Abdoulaye Walsimou Gaye
2009-10-14 11:28 ` Stefan Roese
2009-10-14 12:39 ` Tom Rix
2009-10-14 12:46 ` Tom Rix
2009-10-14 13:23 ` Minkyu Kang
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=4D8BF7D3.3050007@samsung.com \
--to=mk7.kang@samsung.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox