[PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa
Eric Miao
eric.y.miao at gmail.com
Tue Mar 16 09:04:22 EDT 2010
On Tue, Mar 16, 2010 at 8:59 PM, Mark Brown
<broonie at opensource.wolfsonmicro.com> wrote:
> On Tue, Mar 16, 2010 at 08:49:51PM +0800, Haojian Zhuang wrote:
>
>> By the way, I'm still format other patches for share more code between
>> pxa2xx-ssp & pxa168-sssp. Since you're updating ssp. The ssp code will
>> be different between your git tree and mark's asoc git tree. If my
>> patches are merged into asoc git tree, how to sync to your git tree?
>
>> Mark,
>> do you have any comments on syncing code?
>
> As I keep say I believe we need to do an early merge of a topic branch
> that covers the common stuff into both the PXA and ASoC trees, otherwise
> we'll end up with conflicting lines of development and no way to resolve
> them until the merge down.
>
Mark,
So do you have any detailed plan in your mind? I'm basically thinking if
it's possible to setup a common topic branch with pxa-ssp changes to
be a common baseline for both trees.
More information about the linux-arm-kernel
mailing list