[PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa
haojian.zhuang at gmail.com
Wed Mar 17 10:18:42 EDT 2010
On Wed, Mar 17, 2010 at 10:07 AM, Eric Miao <eric.y.miao at gmail.com> wrote:
> On Wed, Mar 17, 2010 at 6:05 PM, Mark Brown
> <broonie at opensource.wolfsonmicro.com> wrote:
>> On Wed, Mar 17, 2010 at 01:14:39PM +0800, Eric Miao wrote:
>>> I'm seeing no merge conflict between my ssp_cleanup and Takashi's
>>> latest tree, which branch do you suggest to merge then?
>> I'm not sure what you're asking here but if you're looking for any
>> incompatible changes in ASoC they've not been implemented yet, the issue
>> is that due to the stuff Liam is working on at the minute there are
>> likely to be incompatible changes in the current release cycle which
>> would mean that merging new drivers (like Haojian posted) via a non-ALSA
>> tree would lead to problems after the trees are been merged together.
> I tried a trivial merge of 'pxa-ssp' branch in your tree, and there's
> a conflict but it's fixable. There won't be much change to make in
> my 'ssp_cleanup' branch except for the pxa168 base support. What
> I can do is I'll try constantly merge of the asoc tree, and see if I can
> provide a conflict resolve which could be later used during upstream
It seems not bad. How about you, Mark?
By the way, I reformat my patches on Eric's git since one of my patch
is contained in his branch (ssp_cleanup). Now I attach them for review first.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 18666 bytes
Desc: not available
More information about the linux-arm-kernel