From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: linux-next: manual merge of the sound-asoc tree with the omap tree Date: Tue, 17 Aug 2010 09:15:59 +0300 Message-ID: <20100817061558.GD12184@atomide.com> References: <20100817122145.f399e543.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:64814 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906Ab0HQGQD (ORCPT ); Tue, 17 Aug 2010 02:16:03 -0400 Content-Disposition: inline In-Reply-To: <20100817122145.f399e543.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Mark Brown , Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarkko Nikula , linux-omap@vger.kernel.org * Stephen Rothwell [100817 05:14]: > Hi all, > > Today's linux-next merge of the sound-asoc tree got a conflict in > arch/arm/mach-omap2/board-n8x0.c between commits > 1c37553eb1778802f0e7b6730df36542752e801e ("omap: n8x0: Cleanup i2c1 and > menelaus registration") and 69be0f6f4b8e3be992ab6a333a3a82e043784c52 > ("omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810") > from the omap tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0 > ("ASoC: multi-component - ASoC Multi-Component Support") from the > sound-asoc tree. > > I couldn't figure this out, so I effectively reverted the part of the > latter commit affecting that file. Is there no way that the latter > commit can be broken up into smaller self contained pieces? Let's let Jarkko and Liam to queue these along with the other ASoC patches, I'll drop them from omap for-next. Jarkko, can you please rebase them? Regards, Tony