From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bartlomiej Sieka <tur@semihalf.com>
Date: Wed, 26 Mar 2008 10:18:52 +0100
Subject: [U-Boot-Users] Pull request: u-boot-testing new-image
In-Reply-To: <20080325233926.1DF29243A7@gemini.denx.de>
References: <20080325233926.1DF29243A7@gemini.denx.de>
Message-ID: <47EA14FC.5050508@semihalf.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.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