public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Piotr Wilczek <p.wilczek@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Date: Tue, 08 Apr 2014 10:54:37 +0200	[thread overview]
Message-ID: <5343B94D.1030608@samsung.com> (raw)
In-Reply-To: <E1WXQmU-0003ZN-Pm@janus>

Hi Albert,

>
> 	include/configs/trats2.h:
> 	- commits 4d6c9671 (Piotr) and aafd2c5d (Przemyslaw)
>
> 	include/configs/trats.h:
> 	- commits fe601647 (Piotr) and 9960d9a8 (Lukasz)
> 	- note: I manually removed CONFIG_EFI_PARTITION and
> 	  CONFIG_PARTITION_UUIDS which are already defined in
> 	  include/configs/exynos4-dt.h
>
> Thanks in advance!
>
> Amicalement,
>

Acked-by: Piotr Wilczek <p.wilczek@samsung.com>
Tested-by: Piotr Wilczek <p.wilczek@samsung.com>

Tested on Trats2.

Best regards,
Piotr Wilczek

  parent reply	other threads:[~2014-04-08  8:54 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-08  7:49 [U-Boot] Merge conflicts between ARM and mainline U-Boot trees Albert ARIBAUD
2014-04-08  8:19 ` Marek Vasut
2014-04-08  8:34 ` Lukasz Majewski
2014-04-08  8:54 ` Piotr Wilczek [this message]
2014-04-08  9:01 ` Pantelis Antoniou
2014-04-08 11:03 ` Przemyslaw Marczak

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=5343B94D.1030608@samsung.com \
    --to=p.wilczek@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