From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751712Ab0L3MYs (ORCPT <rfc822;w@1wt.eu>);
	Thu, 30 Dec 2010 07:24:48 -0500
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 <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 30 Dec 2010 07:24:46 -0500
Date: Thu, 30 Dec 2010 13:24:45 +0100
Message-ID: <s5hei8zmos2.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
        Liam Girdwood <lrg@slimlogic.co.uk>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the sound-asoc tree
In-Reply-To: <20101228021747.GB30589@opensource.wolfsonmicro.com>
References: <20101228104024.fb0e9e34.sfr@canb.auug.org.au>
	<20101228104834.84202d88.sfr@canb.auug.org.au>
	<20101228021747.GB30589@opensource.wolfsonmicro.com>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 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