From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric.y.miao@gmail.com (Eric Miao) Date: Wed, 17 Mar 2010 22:07:12 +0800 Subject: [PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa In-Reply-To: <20100317100538.GC13166@opensource.wolfsonmicro.com> References: <1268740373-27407-1-git-send-email-eric.y.miao@gmail.com> <1268740373-27407-8-git-send-email-eric.y.miao@gmail.com> <771cded01003160549t73b30cccr7ba56722c28f013c@mail.gmail.com> <20100316125955.GB7287@rakim.wolfsonmicro.main> <20100316132305.GA8875@rakim.wolfsonmicro.main> <20100316140834.GB9365@rakim.wolfsonmicro.main> <20100317100538.GC13166@opensource.wolfsonmicro.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Mar 17, 2010 at 6:05 PM, Mark Brown 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 merge.