Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-22 Thread Mark Brown
On Fri, Sep 21, 2012 at 01:26:43AM -0700, Olof Johansson wrote: > I'll take a look at merging it tomorrow after I've dealt with smp_ops; > if it looks reasonably conflict-free I'll pull it in. We need the > sound dependency sorted out (or agreed upon) first though. I guess in the light of the res

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-22 Thread Shawn Guo
On Sat, Sep 22, 2012 at 01:09:27AM -0700, Olof Johansson wrote: > > I've pulled this in now as staging/imx-multiplatform. > > > > As you mention, it might or might not make sense to send this up. It > > also accrued a few more merge conflicts with other branches in > > arm-soc, so we'll see how thi

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-22 Thread Olof Johansson
On Sat, Sep 22, 2012 at 12:41 AM, Olof Johansson wrote: > Hi, > > On Fri, Sep 21, 2012 at 9:53 AM, Shawn Guo wrote: >> On Sat, Sep 22, 2012 at 12:46:26AM +0800, Shawn Guo wrote: >>> I just published the branch below with this series rebased on top of >>> the necessary dependant branches. >>> >>>

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-22 Thread Olof Johansson
Hi, On Fri, Sep 21, 2012 at 9:53 AM, Shawn Guo wrote: > On Sat, Sep 22, 2012 at 12:46:26AM +0800, Shawn Guo wrote: >> I just published the branch below with this series rebased on top of >> the necessary dependant branches. >> >> git://git.linaro.org/people/shawnguo/linux-2.6.git >> staging/im

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-21 Thread Shawn Guo
On Sat, Sep 22, 2012 at 12:46:26AM +0800, Shawn Guo wrote: > I just published the branch below with this series rebased on top of > the necessary dependant branches. > > git://git.linaro.org/people/shawnguo/linux-2.6.git staging/imx-multiplatform > > The dependant branches include: > Forgot t

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-21 Thread Shawn Guo
Hi Olof, On Fri, Sep 21, 2012 at 01:26:43AM -0700, Olof Johansson wrote: > I'll take a look at merging it tomorrow after I've dealt with smp_ops; > if it looks reasonably conflict-free I'll pull it in. We need the > sound dependency sorted out (or agreed upon) first though. > I just published the

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-21 Thread Olof Johansson
On Fri, Sep 21, 2012 at 1:01 AM, Shawn Guo wrote: > On Thu, Sep 20, 2012 at 03:56:56PM +, Arnd Bergmann wrote: >> Ok, fair enough. I think we can put it in arm-soc/for-next as a staging >> branch anyway to give it some exposure to linux-next, and then we can >> decide whether a rebase is neces

Re: [alsa-devel] [PATCH v2 00/34] i.MX multi-platform support

2012-09-21 Thread Shawn Guo
On Thu, Sep 20, 2012 at 03:56:56PM +, Arnd Bergmann wrote: > Ok, fair enough. I think we can put it in arm-soc/for-next as a staging > branch anyway to give it some exposure to linux-next, and then we can > decide whether a rebase is necessary before sending it to Linus. > I just saw the annou