From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: linux-next: build failure after merge of the sound-asoc tree Date: Thu, 30 Dec 2010 13:24:45 +0100 Message-ID: References: <20101228104024.fb0e9e34.sfr@canb.auug.org.au> <20101228104834.84202d88.sfr@canb.auug.org.au> <20101228021747.GB30589@opensource.wolfsonmicro.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: Received: from cantor2.suse.de ([195.135.220.15]:52333 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750761Ab0L3MYq (ORCPT ); Thu, 30 Dec 2010 07:24:46 -0500 In-Reply-To: <20101228021747.GB30589@opensource.wolfsonmicro.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Mark Brown Cc: Stephen Rothwell , Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org At Tue, 28 Dec 2010 02:17:48 +0000, Mark Brown wrote: > > On Tue, Dec 28, 2010 at 10:48:34AM +1100, Stephen Rothwell wrote: > > > Mark, I reversed the order of the trees today ... > > That's expected, Takashi is on holiday at the minute so not updating his > tree. Merging ASoC first will mean you get the fixes in ASoC plus the > additional stuff in the sound tree which seems more sensible. I pulled now. Let me know if it's still broken (maybe in the new year?) thanks, Takashi