On Thu, Jun 20, 2013 at 05:08:25PM +0530, Amit Kucheria wrote:
On Wed, Jun 19, 2013 at 10:02 PM, Mark Brown broonie@linaro.org wrote:
Features for the stable kernel are agreed by the TSC. Once a feature has been agreed by the TSC there should be an owner assigned to deliver a feature branch into the stable kernel and work with the stable kernel team to resolve any integration issues at least up until the feature has been included in a release. This will be done per kernel version.
Each feature request from the TSC may or may not conflict with other features already part of the LSK tree. Members might want to pick and choose what feature branches from LSK they include internally.
Is there a single LSK integrated tip or do you expect to maintain a forest of feature branches and then make several flavours of tip branches available based on member requirements?
Both - cut the number of kernels down as far as possible but no further, merging as much as we can together and basing as much as possible on a single core kernel. We've already got a separate variant for Android for example. A lot depends on what the features we end up with are and how nicely they play with each other and with being disabled at compile time.
The LSK can be updated either by replacing an existing topic branch or by submitting incremental patches. Replacement would be most useful in cases where a feature has not yet been merged into the standard kernel and is still being redeveloped there but otherwise incremental updates are preferred. The process for submitting changes is the same as for new features with the exception that incremental updates should be based on the topic branch in the LSK git rather than the standard kernel.
Assuming you keep all feature branches, do you have a versioning policy in mind? e.g. feature_foo_v1, feature_foo_v2, etc.
I don't propose to keep older versions of the branches hanging around except as part of the tagged releases, therefore the branches would just be featureX, featureY and so on. I don't think it's worth the hassle of trying to version this stuff especially in the case where we are doing incremental updates on top of an existing feature branch.
If there were multiple LTS kernel versions active they would be per kernel version but that's a bit of a different game.