On Mon, 2013-10-14 at 17:59 +0100, Mark Brown wrote:
On Mon, Oct 14, 2013 at 05:22:47PM +0100, Jon Medhurst (Tixy) wrote:
I'm wondering how I'm going to maintain the definitive bit.LITTLE MP branch [1] we point members/customers to.
I hadn't been aware of this until you mentioned it just now... what's the difference to the LSK topic branch?
It only consists of the patches that are considered part of the 'big.LITTLE MP' patchset. The LSK topic ended up with some other stuff as when LSK was first put together things were a bit hurried and vague.
I'm going to have to put all these fixups going into LSK into that branch too, and then that is going to have to get merged back into LSK, duplicating the commits already there. I guess that's OK, but seems like it would be cleaner if the patches went into the MP branch first.
Well, if the branch were what was synced with the LSK topic branch these merges would end up being noops unless we ended up with concurrent development (which seems relatively unlikely) - any backmerges would just be fast forwards.
But if the topics have different patches in?
Perhaps we'll have to reconsider again how all this is done.