[PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa

[Eric Miao]

On Tue, Mar 16, 2010 at 10:08 PM, Mark Brown
<broonie at opensource.wolfsonmicro.com> wrote:
> On Tue, Mar 16, 2010 at 09:47:58PM +0800, Eric Miao wrote:
>
>> After that, there could be only minor changes, which could be easily
>> merged either way, and I'd be happy to see ASoC tree add good
>> support the pxa ssp. So what I'm thinking now is actually which one
>> is easier, to merge asoc into pxa and get ssp cleaned up or to rebase
>> asoc onto this ssp cleanup branch. I might need to take a look into
>> what's going on inside asoc to evaluate this.
>
> Rebasing isn't an option for ASoC - it gets merged into Takashi's tree
> for one thing (and I don't see any reason why rebasing would be required
> anyway, no point in discarding history).  A merge into ASoC should be
> sufficient, right now there's no changes at all in the SSP code against
> Linus' tree so that'll be trivial anyway at the minute.
>
> There's also no need to pick one route for the merge - if we do merges
> and avoid rebasing then git will cope fine.
>

Mark,

I'm seeing no merge conflict between my ssp_cleanup and Takashi's
latest tree, which branch do you suggest to merge then?