On Wed, 2012-05-09 at 08:45 -0700, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@xxxxxx> [120509 01:12]: > > > > Below is the pull request for board file related changes. Tested on > > panda & 4430sdp. > > Thanks, I've merged that into clenaup-dss branch and will send it > along with other still pending cleanup branches. > > > How should I manage my tree related to this... Should I rebase my > > original DT preparation series on top of this new branch, or can I just > > ignore the new branch for now, as long as I merge it at some point > > before sending a pull request to mainline? > > Yes you need to rebase on this now. And not touch these commits. > > Otherwise we'll end up with duplicate commits in the mainline tree, > which is a big no-no. If something shows up that needs fixing in this > series, it must now be separate patches on top of this series. > > When doing pull requests we both just have to make note that there's > a dependency to this branch, and it will find it's way to mainline > via arm-soc pull request. Or if no conflicts need sorting out, then > it will just get merged with your pull request. Hmm, I'm still not totally sure how to proceed. What do you mean with "make a note"? I understand that I can't change the commits, but is it ok for me to now merge the for-l-o-3.5 branch into my master branch (which is my "stable" branch, for which I'll send a pull request)? If the same commits are both in my tree and in l-o (or arm-soc), doesn't it mean that the commits seem to come into Linus's tree from whoever happens to send their pull request first? Then again, does it matter.. And if there are conflicts in the board files between for-l-o-3.5 and some other commits, and you or Arnd resolve those for l-o or arm-soc, what happens when the same, but unresolved, commits come from my pull request? Sorry if this should be obvious, but I haven't done such merging before and I'd rather not mess it up =). Tomi
Attachment:
signature.asc
Description: This is a digitally signed message part
