Prafulla Wadaskar wrote:
-----Original Message----- From: Tom [mailto:Tom.Rix@windriver.com] Sent: Tuesday, September 22, 2009 6:50 PM To: Prafulla Wadaskar Cc: U-Boot; Paulraj, Sandeep; Minkyu Kang; Wolfgang Denk Subject: Re: [U-Boot] [U-boot] Marvell Pull Request
Prafulla Wadaskar wrote:
-----Original Message----- From: Tom [mailto:Tom.Rix@windriver.com] Sent: Tuesday, September 22, 2009 12:46 AM To: Prafulla Wadaskar Cc: U-Boot Subject: Re: [U-Boot] [U-boot] Marvell Pull Request
Prafulla Wadaskar wrote:
Hi Wolfgang
Please pull
Shouldn't this rather get pulled to u-boot-arm? Tom
Hi Tom, Yes :-) you are right. I was bit biased since u-boot-marvell.git was cloned from u-boot.git Shall I generate new email pull request? Or Can you please kindly pull it to u-boot-arm?
I would like to set up a process where I just cherry picked your changes directly from marvell/master.
Comparing marvell/master to arm/next
git cherry t-next
- ceb2d57c2205db5bbd868577f756c74a2568160c
- 95a4a593b577b6e2f1da2d4b0f5ec86975c33413
- 84a45d33c2cc261dbd5411f7c2ad45f6003025b6
- e67af44d0167d8237dd2c2ddf8e301d19ca12914
- 0413cfecea350000eab5e591a0965c3e3ee0ff00
- 3b6a9267f0de7b85d387fa4123d0b58379363447
- ffed6c85ce591cd93e28190153fec421c3b2499c <- pick me
- c928c19b2563e4977adc0570d06c900ac1e7788c <- pick me
- 9ef0569a3c8b0d2458bdbce21a5370807e13e20a <- pick me
The others look like they came from u-boot/master
It would be helpful but not required if you merged against arm/master or arm/next instead of u-boot/master.
I think this makes more sense to merge it from arm/master, I will do that, I am thinking of creating a branch "arm" instead of disturbing master, what do you think?
I think keeping the branches simple 'master', 'next' and optionally 'testing' is better.
Locally you can do whatever you want. I make a compound mirror of u-boot, arm and all the vendor arms to help me navigate the cherry picking.
If I can assume what is good in marvell/master, we do not need for you go through the asking for a pulls, they will just happen when I have time, likely over the weekend.
If I have clean changes in lined with arm/master, then why not to pull?
Yes that would be ideal. I like to look over the changes before I merge them in so it is not going to be that automatic.
These changes will accumulate in arm/next.
If this is clear from you that Changes will be accumulated in arm/next then I must rebase a branch on u-boot-marvell.git with arm/next.
Less frequently I will merge these to arm/master. This will happen once you and the other arm maintainers have given then the ok. I was thinking that this could happen monthly but I am open for other suggestions.
I think monthly will be too long, may be wolfgang can comment better on this :-)
Yup
Tom