From: Bartlomiej Sieka <tur@semihalf.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] Pull request: u-boot-testing new-image
Date: Wed, 26 Mar 2008 10:18:52 +0100 [thread overview]
Message-ID: <47EA14FC.5050508@semihalf.com> (raw)
In-Reply-To: <20080325233926.1DF29243A7@gemini.denx.de>
Wolfgang Denk wrote:
> Dear Bartek,
>
> in message <47E4D565.105@semihalf.com> you wrote:
>> Support for the new uImage format is available in the git repository at:
>>
>> git://www.denx.de/git/u-boot-testing.git new-image
>>
>> The branch contains all patches related to the new uImage development
>> that have been posted to the list.
>
> Sorry, but can you please rebase your patches against current HEAD?
>
> I get merge conflicts:
[...]
> Please fix.
Dear Wolfgang,
To summarize our off-list communication: merge conflicts of the
new-image branch with the current master have been resolved, new uImage
stuff is now ready for pulling from the master_merge_new-image branch.
Regards,
Bartlomiej
next prev parent reply other threads:[~2008-03-26 9:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-22 9:46 [U-Boot-Users] Pull request: u-boot-testing new-image Bartlomiej Sieka
2008-03-25 23:39 ` Wolfgang Denk
2008-03-26 9:18 ` Bartlomiej Sieka [this message]
2008-03-26 10:15 ` Wolfgang Denk
2008-03-26 11:44 ` Jerry Van Baren
2008-03-26 14:13 ` Wolfgang Denk
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=47EA14FC.5050508@semihalf.com \
--to=tur@semihalf.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