public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jerry Van Baren <gerald.vanbaren@ge.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] Pull request: u-boot-testing new-image
Date: Wed, 26 Mar 2008 07:44:37 -0400	[thread overview]
Message-ID: <47EA3725.60707@ge.com> (raw)
In-Reply-To: <20080326101516.780B1243A7@gemini.denx.de>

Wolfgang Denk wrote:
> In message <47EA14FC.5050508@semihalf.com> you wrote:
>>> 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.
> 
> I merged the new stuff into the master branch now.
> 
> This makes the u-boot-testing.git new-image branch obsolete, so I
> removed it.
> 
> Best regards,
> 
> Wolfgang Denk

...and the crowd cheers!  Thanks, Bartlomiej, for the planning, the 
work, and hanging tough through the acceptance process.

Best regards,
gvb

  reply	other threads:[~2008-03-26 11:44 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
2008-03-26 10:15     ` Wolfgang Denk
2008-03-26 11:44       ` Jerry Van Baren [this message]
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=47EA3725.60707@ge.com \
    --to=gerald.vanbaren@ge.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