Date: Tue, 01 Dec 2009 11:43:46 +0100
Message-ID: <s5h8wdn0yal.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
       linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for December 1
In-Reply-To: <20091201102900.GA11715@sirena.org.uk>
References: <20091201190301.0fb7abad.sfr@canb.auug.org.au>
	<20091201102900.GA11715@sirena.org.uk>
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.1
 (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
Content-Length: 1017
Lines: 29

At Tue, 1 Dec 2009 10:29:01 +0000,
Mark Brown wrote:
> 
> On Tue, Dec 01, 2009 at 07:03:01PM +1100, Stephen Rothwell wrote:
> 
> > Merging sound/for-next
> > Applying: ASoC: tlv320dac33: Change RT wq to singlethread wq
> 
> According to this the sound tree should be being merged into the next
> tree but when I look in the master branch of your git I'm not seeing any
> sign of it - am I missing something here?  The head of your master
> branch that I see is 16aa56906ae11bfdb145676a5fb5c5f43394148d "Add
> linux-next specific files for 20091201".
> 
> The same thing happened yesterday.

Stephen, please drop that specific patch from your tree (if it's really
applied).  It's been already in sound git tree, so the build should be
OK now without it.


thanks,

Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/