From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753202AbZKMNLt (ORCPT ); Fri, 13 Nov 2009 08:11:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752171AbZKMNLp (ORCPT ); Fri, 13 Nov 2009 08:11:45 -0500 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:40660 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751800AbZKMNLo (ORCPT ); Fri, 13 Nov 2009 08:11:44 -0500 Date: Fri, 13 Nov 2009 13:11:48 +0000 From: Mark Brown To: Takashi Iwai Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Ujfalusi , vikram pandita , Tony Lindgren Subject: Re: linux-next: manual merge of the sound tree with the omap tree Message-ID: <20091113131148.GC21516@rakim.wolfsonmicro.main> References: <20091113131947.03d1b259.sfr@canb.auug.org.au> <20091113123901.GB30966@sirena.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Cookie: This end up. User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 13, 2009 at 02:06:44PM +0100, Takashi Iwai wrote: > Mark Brown wrote: > > into the OMAP tree to resolve this. There's some older ASoC changes in > > there to ensure the patches applied but I'm happy for you to carry those > > providing Takashi is. > I can merge the tree above to for-next branch of sound git tree, too. > In that way, we can keep asoc branches clean. I believe that creates the same problem both ways :/ . If we merge OMAP->sound we may as well put it on the ASoC topic branch, it'll probably be helpful for people doing OMAP work anyway.