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 S1754897Ab0C2IFd (ORCPT <rfc822;w@1wt.eu>);
	Mon, 29 Mar 2010 04:05:33 -0400
Received: from cantor.suse.de ([195.135.220.2]:53339 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751829Ab0C2IFc (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 29 Mar 2010 04:05:32 -0400
Date: Mon, 29 Mar 2010 10:05:31 +0200
Message-ID: <s5h1vf34kok.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tejun Heo <tj@kernel.org>, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org, Daniel Mack <daniel@caiaq.de>
Subject: Re: linux-next: build failure after merge of the slabh tree
In-Reply-To: <20100329190148.2a0849b8.sfr@canb.auug.org.au>
References: <20100329160250.1515a2ca.sfr@canb.auug.org.au>
	<s5hy6hb4p6u.wl%tiwai@suse.de>
	<20100329173852.3550bbea.sfr@canb.auug.org.au>
	<20100329190148.2a0849b8.sfr@canb.auug.org.au>
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
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Mon, 29 Mar 2010 19:01:48 +1100,
Stephen Rothwell wrote:
> 
> Hi Takashi,
> 
> On Mon, 29 Mar 2010 17:38:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 29 Mar 2010 08:28:09 +0200 Takashi Iwai <tiwai@suse.de> wrote:
> > >
> > > Thanks, I applied all these oneliners to sound/usb/* as a single
> > > patch now.
> > 
> > Again, thanks.  They were just one liner because I found them one at a
> > time :-(
> 
> Looks like you missed the one that updated sound/usb/pcm.c ... ah, I
> forgot to cc you, sorry.  Here is the patch again:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 29 Mar 2010 16:37:58 +1100
> Subject: [PATCH] sound: usb pcm: use of kmalloc requires the include of slab.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks, applied this one, too :)


Takashi


> ---
>  sound/usb/pcm.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
> index 630e220..2bf0d77 100644
> --- a/sound/usb/pcm.c
> +++ b/sound/usb/pcm.c
> @@ -15,6 +15,7 @@
>   */
>  
>  #include <linux/init.h>
> +#include <linux/slab.h>
>  #include <linux/usb.h>
>  #include <linux/usb/audio.h>
>  #include <linux/usb/audio-v2.h>
> -- 
> 1.7.0.3
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>