From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754793Ab0I3G6D (ORCPT ); Thu, 30 Sep 2010 02:58:03 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:44712 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754212Ab0I3G6B (ORCPT ); Thu, 30 Sep 2010 02:58:01 -0400 Date: Wed, 29 Sep 2010 23:58:13 -0700 From: Mark Brown To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Cc: Stephen Rothwell , Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sascha Hauer Subject: Re: linux-next: manual merge of the sound-asoc tree with the i.MX tree Message-ID: <20100930065813.GA1744@opensource.wolfsonmicro.com> References: <20100930112302.e554d367.sfr@canb.auug.org.au> <20100930033110.GA5762@opensource.wolfsonmicro.com> <20100930064533.GJ29811@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20100930064533.GJ29811@pengutronix.de> X-Cookie: You'll be sorry... 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 Thu, Sep 30, 2010 at 08:45:33AM +0200, Uwe Kleine-König wrote: > I might be wrong, but I think there are no non-audio users of the ssi > device? That's kind of the point; while this is a generic serial port I've never seen it used for anything except audio. > I think the correct fix is to squash the patch I just sent into the > commit merging the two. If there's no non-audio users there's no need to do the rename - the renames are to avoid having the ASoC DAI drivers suddenly start binding with other drivers so we could just revert the rename in ASoC which would remove the merge issue.