On 04/03/2012 06:29 PM, Somebody in the thread at some point said:
On Tue, 2012-04-03 at 14:51 +0530, Tushar Behera wrote:
For Samsung LT kernel, we have followed an approach where in the commits in John's linaro_config_3.3 branch are taken to be stable commits and we have put those commits as the very first set of commits on LT kernel. Our LT kernel being a _serialized_ kernel where topic branches sit one over the other, the related config fragments are made part of the topic branches.
A sample view of the same is posted at [1].
[1] git://git.linaro.org/landing-teams/working/samsung/kernel.git (lt/next)
The Samsung tree has the non samsung config files, like linaro-base.conf. I was wondering if that would cause merge problems if every LT had them and at possibly different versions. I guess it doesn't matter so long as all LTs got them from the same definitive 'upstream' source, and that they didn't edit them.
Squidging them all together will anyway require a lot of automated conflict resolution happening, favouring later version of this common file would probably not be noticable.
I'll have a go at Tushar's method tomorrow it looks like a good plan.
I think it makes sense if this 'upstream' doesn't include board files though, they should come from LT trees.
Normally "board files" means mach-xyz/board*.c for me I am guessing you mean board-specific defconfigs ^^
-Andy