Re: [U-Boot-Users] Pull request: u-boot-testing new-image

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