[U-Boot-Users] [GIT PULL] Please pull u-boot-arm

Wolfgang Denk wd at denx.de
Thu Apr 10 12:24:21 CEST 2008


Dear Peter,

in message <000801c89255$d637b670$3a4d010a at Emea.Arm.com> you wrote:
>
> These are the patches:
> 
> [PATCH v2] ARM: Davinci: Fix DM644x timer overflow handling and cleanup
> [PATCH] DM644x: This patch removes all boardspecific code from the arch part
> for DM644x (DaVinci) boards
> [PATCH] DM644x: (2nd try) This adds support fortheProdrivePMDRA board, based
> on a DM6441
> [PATCH 0/7] Respin of Sascha Hauer's i.MX31support plus MX31ADS
...
> Guennadi Liakhovetski (1):
>       Support for the MX31ADS evaluation board from Freescale
...
> Sascha Hauer (6):
>       Separate omap24xx specific code from arm1136
>       core support for Freescale mx31
>       add an i2c driver for mx31
>       add SMSC LAN9x1x Network driver
>       mx31 litekit support
>       Phytec Phycore-i.MX31 support

I would expect, that the state of the current repository represents
what we get after applying Sascha's and Guennadi's patches (in the
correct versions and order). Howver, the current tree looks totally
different to me.

Can you please check with Guennadi what happened, how this can be
cleaned up, and especially how this can be prevented in the future?

Note that there is not only not the expected state of the source code,
but there is also corruption of meta-information again; for example:

	-> git-show --pretty=fuller 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6
	commit 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6
	Author:     Guennadi Liakhovetski <[lg at denx.de]>
-------------------------------------------^^^^^^^^^^^^
	AuthorDate: Sun Mar 30 11:32:30 2008 +0100
	Commit:     Peter Pearse <peter.pearse at arm.com>
	CommitDate: Sun Mar 30 11:32:30 2008 +0100

	    Support for the MX31ADS evaluation board from Freescale
	...

None of Guennadis messages on the mailing list  ever  used  something
like "[lg at denx.de]" - this must be something that happend on your end
when  processing  his  patches.  Where  are the brackets coming from?
Don't you use git-am to apply the patches?

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 at denx.de
If a man had a child who'd gone  anti-social,  killed  perhaps,  he'd
still tend to protect that child.
	-- McCoy, "The Ultimate Computer", stardate 4731.3




More information about the U-Boot mailing list