From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Date: Tue, 8 Apr 2014 10:19:21 +0200 [thread overview]
Message-ID: <201404081019.21229.marex@denx.de> (raw)
In-Reply-To: <E1WXQmU-0003ZN-Pm@janus>
On Tuesday, April 08, 2014 at 09:49:17 AM, Albert ARIBAUD wrote:
> Hello all,
>
> There are four merge conflicts currently between ARM and mainline.
>
> I have created a 'merged' branch on the ARM repository with what I
> think the resolutions should be. Some are trivial, others, less.
>
> Could commit authors and/or custodians (CC:ed) please confirm or
> indicate correct resolutions?
>
> Overall resolutions can be seen (assuming your remote for the ARM tree
> is 'u-boot-arm'
>
> git fetch git://git.denx.de/u-boot-arm merged:arm-merged
> git show arm-merged
>
> Resolutions, from the most to the least trivial:
>
> arch/arm/cpu/arm926ejs/mxs/Makefile:
> - commits 1a9df13d and b97241b3 (both Marek)
What was the problem here ... the MKIMAGE/UIMAGE change, right? Looks correct.
Best regards,
Marek Vasut
next prev parent reply other threads:[~2014-04-08 8:19 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 [this message]
2014-04-08 8:34 ` Lukasz Majewski
2014-04-08 8:54 ` Piotr Wilczek
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=201404081019.21229.marex@denx.de \
--to=marex@denx.de \
--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