Re: [PATCH 1/6] staging: android: binder: Remove some funny && usage

Brian Swetland
2009-06-24T23:37:52Z

On Wed, Jun 24, 2009 at 4:29 PM, Daniel Walker<dwalker@fifo99.com> wrote:
>> Unfortunately, no.  However, the generic changes tend to be
>> self-contained (binder, logger, etc) and not necessary for core msm7k
>> support.  The one set of changes that does touch both generic and
>> platform code is the wakelock/suspendblock stuff, which some of the
>> drivers make use of, but that's usually not very invasive.
>>
>> http://android.git.kernel.org/?p=kernel/msm.git;a=shortlog;h=refs/heads/android-msm-2.6.29
>> is the most up to date msm7k tree.
>
> Having a tree with strictly msm changes is kind of a minimum requirement
> for mainline. It would be good to split your tree into branches with
> specific functionality. For instance one branch with just msm, one
> branch with just wakelocks, and one branch with driver changes (or one
> branch per driver change). Then you can merge all those branches
> together which would make your unified kernel.

For stuff going upstream in the past (earlier contributions via
lakml), I've generally pulled out series of patches for review and
built up a for-rmk branch to pull from or the like.

We tend to rebase onto a kernel release (last time was 2.6.29) and
work on that towards a platform release, and simultaneously we can be
feeding patches upstream (we should be doing more of this, obviously).
When we rebase up to the next release we snap to, we pick up anything
that's already gone upstream, and in theory, over time the delta
between our tree and mainline shrinks. This was the case when we
moved to .29 from .27 (as a bunch of msm7k patches had gone into .28).

Brian