[U-Boot-Users] Pull request: u-boot-testing new-image - U-Boot - denx.biz

newer
[U-Boot-Users] [PATCH] Add...

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

older
[U-Boot-Users] [PATCH] 85xx: Add...

Bartlomiej Sieka

22 Mar 2008 22 Mar '08

10:46 a.m.

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

Reply

Show replies by date

Wolfgang Denk

26 Mar 26 Mar

12:39 a.m.

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:

-> 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

-- 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@denx.de Any sufficiently advanced technology is indistinguishable from magic. - Arthur C. Clarke

Reply

Bartlomiej Sieka

10:18 a.m.

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

Reply

Wolfgang Denk

11:15 a.m.

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

-- 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@denx.de I'd like to meet the man who invented sex and see what he's working on now.

Reply

Jerry Van Baren

12:44 p.m.

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

Wolfgang Denk

3:13 p.m.

In message 47EA3725.60707@ge.com 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

-- 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@denx.de A well-written program is its own heaven; a poorly-written program is its own hell. -- Geoffrey James, "The Tao of Programming"

Reply

6256

Age (days ago)

6260

Last active (days ago)

Download

5 comments

3 participants

tags (0)

participants (3)

Bartlomiej Sieka
Jerry Van Baren
Wolfgang Denk