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

[Wolfgang Denk]

Dear Peter,

in message <000201c89bb3$161c3de0$3a4d010a at Emea.Arm.com> you wrote:
>  
> 	I see that in correcting the formats of the patches I have neglected to
> correct the line counts for new files, thus losing the final lines of the
> file.

Please don't do that. Please never, never ever edit patches. It is of
utmost importance that pathces that were posted on the mailing list ar
applied as is, without any modifications. Please keep in mind that in
most cases such patches were exported from a git repository, and
applying modified patches would cause version conflicts as the
original and the newly created code that are supposed to be identical
are actually different.

Also, such manipulations break the whole idea of having a transparent
and easily trackable development process - the  original  author  has
signed  off  his  version  of the patch, and he has a right that this
patch is checked in as is (or rejected). If one applies modifications
to a patch, he sneaks in his own changes completely invisible to  the
otherwise excellent consisitency checking of the git tools.


Peter, please stop doing this. Please make sure to apply the  patches
without  any  modifications,  and please use only use git tools to do
this.

If you want to make changes to the code, then please do this in a
separate step, with a separate git commit which then sidentifies you
as the author of these changes.

Also, please make sure not to mix changes of real content and  coding
style  cleanup  into  one  commit;  always keep these sepoarated into
independent commits - otherwise the original author of the  code  has
serious problems to find out what was changed, and why.


I must admit that I don;t really know what to  do  with  the  current
state  of  the  git  repository now. Frankly, I don't like the status
quo. I think the cleanest way is to revert the changes introduced  by
the  last pull from the u-boot-arm repository. Then you could restart
the u-boot-arm from a clean state, and re-apply the list pf  patches,
this  time  unchanged.  Once  this has been done, I would pull again.
Would such a plan be acceptable to you?

Here is the list of commits I would like to revert:

	066bebd6353e33af3adefc3404560871699e9961
	7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6
	c88ae20580b2b01487b4cdcc8b2a113f551aee36
	a147e56f03871bba4f05058d5e04ce7deb010b04
	d6674e0e2a6a1f033945f78838566210d3f28c95
	8c8463cce44d849e37744749b32d38e1dfb12e50
	c98b47ad24b2d91f41c09a3d62d7f70ad84f4b7d
	8bf69d81782619187933a605f1a95ee1d069478d
	8c16cb0d3b971f46fbe77c072664c0f2dcd4471d
	a574a73852a527779234e73e17e7597fd8128882
	1377b5583a48021d983e1fd565f7d40c89e84d63
	1704dc20917b4f71e373e2c888497ee666d40380

Please comment.

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
As usual, this being a 1.3.x release, I haven't  even  compiled  this
kernel yet. So if it works, you should be doubly impressed.
      - Linus Torvalds in <199506181536.SAA10638 at keos.cs.Helsinki.FI>