On 14 November 2012 15:55, Liviu Dudau Liviu.Dudau@arm.com wrote:
On Wed, Nov 14, 2012 at 10:06:49AM +0000, Viresh Kumar wrote:
Whatever doesn't break HMP patches can go into master directly. The purpose here is, that partners should be able to test HMP stuff on their boards with Linaro kernel.
So the expectations is that partners (ARM included) take the patches from experimental and test them with master. Is the onus on the creator of the patch to do the testing?
Not always. Sometimes we just pick patches from Mainline, that are developed by guys not working on ARM platforms. So, either i have to test them or somebody else.
But people who are working in Linaro or ARM, they can atleast test their patches against master.
so there is no specific order i follow during these merges.
Question was: when you do the octopus merge, do you place the list of topic branches in a specific order or you randomly (or alphabetically) sort the list. Interested from a "tracking your git tree" point of view.
Ahh.. Above reply from me is for this question only. :) I don't follow any particular order unless there is some dependency between branches.
-- viresh