Pull request: u-boot-testing new-image
Dear Wolfgang,
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.
Regards,
Bartlomiej
Dear Bartek,
Quoted 7 lines · in message <[email protected]> you wrote:
Support for the new uImage format is available in the git repository at:
git://www.denx.de/git/u-boot-testing.gitnew-imageThe 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:
-> git-pull git://www.denx.de/git/u-boot-testing.git new-image
remote: Counting objects: 1039, done.
remote: Compressing objects: 100% (275/275), done.
remote: Total 887 (delta 758), reused 714 (delta 609) Receiving objects: 100% (887/887), 206.94 KiB, done. Resolving deltas: 100% (758/758), completed with 115 local objects. Auto-merged Makefile
Auto-merged README
Auto-merged board/cray/L1/L1.c
Auto-merged common/Makefile
Auto-merged common/cmd_bootm.c
CONFLICT (content): Merge conflict in common/cmd_bootm.c Auto-merged cpu/mpc5xxx/cpu.c
Auto-merged cpu/mpc8xx/cpu.c
CONFLICT (content): Merge conflict in cpu/mpc8xx/cpu.c Auto-merged fs/cramfs/uncompress.c
Auto-merged include/common.h
Auto-merged include/libfdt.h
Removed lib_i386/i386_linux.c
Removed lib_m68k/m68k_linux.c
Removed lib_microblaze/microblaze_linux.c
Auto-merged libfdt/fdt.c
Auto-merged libfdt/fdt_ro.c
Auto-merged libfdt/fdt_rw.c
Automatic merge failed; fix conflicts and then commit the result.
Please fix.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Any sufficiently advanced technology is indistinguishable from magic.
- Arthur C. ClarkeQuoted 13 lines · Wolfgang Denk
Dear Bartek,
Quoted 6 lines · in message <[email protected]> you wrote:
Support for the new uImage format is available in the git repository at:
git://www.denx.de/git/u-boot-testing.gitnew-imageThe 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:
[...]
Quoted 1 line
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
Wolfgang Denk
AppliedQuoted 12 lines · In message <[email protected]> you wrote:
Quoted 4 lines
Quoted 2 lines · in message <[email protected]> you wrote:
Support for the new uImage format is available in the git repository at:
Quoted 8 lines
Quoted 4 lines
git://www.denx.de/git/u-boot-testing.gitnew-imageThe 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:
Quoted 8 lines
[...]
Quoted 1 line
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
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de I'd like to meet the man who invented sex and see what he's working on now.
Quoted 19 lines · Wolfgang Denk
Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 9 lines
Quoted 6 lines · in message <[email protected]> you wrote:
Support for the new uImage format is available in the git repository at:
git://www.denx.de/git/u-boot-testing.gitnew-imageThe 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?
Quoted 8 lines
Quoted 1 line
I get merge conflicts:
[...]
Quoted 1 line
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.
Quoted 8 lines
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
Quoted 3 lines · In message <[email protected]> you wrote:
...and the crowd cheers! Thanks, Bartlomiej, for the planning, the work, and hanging tough through the acceptance process.
Me too: Thanks a lot, Bartek!
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de A well-written program is its own heaven; a poorly-written program is its own hell. -- Geoffrey James, "The Tao of Programming"