From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753343Ab0C2G2M (ORCPT ); Mon, 29 Mar 2010 02:28:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45119 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752746Ab0C2G2L (ORCPT ); Mon, 29 Mar 2010 02:28:11 -0400 Date: Mon, 29 Mar 2010 08:28:09 +0200 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: Tejun Heo , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Mack Subject: Re: linux-next: build failure after merge of the slabh tree In-Reply-To: <20100329160250.1515a2ca.sfr@canb.auug.org.au> References: <20100329160250.1515a2ca.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: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 29 Mar 2010 16:02:50 +1100, Stephen Rothwell wrote: > > Hi Tejun, > > After merging the slabh tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > sound/usb/mixer_quirks.c: In function 'snd_usb_soundblaster_remote_init': > sound/usb/mixer_quirks.c:144: error: implicit declaration of function 'kmalloc' > sound/usb/mixer_quirks.c:144: warning: assignment makes pointer from integer without a cast > > Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't > implicitly include slab.h from percpu.h") from the slabh tree interacting > with commit 7b1eda223debcba706ab989a09c4eecb327aebdf ("ALSA: usb-mixer: > factor out quirks") from the sound tree. > > I applied the following merge fixup patch which should be applied to the > sound tree (see Documentation/SubmitChecklist Rule #1 :-)). Thanks, I applied all these oneliners to sound/usb/* as a single patch now. Takashi > From: Stephen Rothwell > Date: Mon, 29 Mar 2010 15:59:58 +1100 > Subject: [PATCH] sound: use of kmalloc requires the include of slab.h > > Signed-off-by: Stephen Rothwell > --- > sound/usb/mixer_quirks.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c > index 56b6659..e7df1e5 100644 > --- a/sound/usb/mixer_quirks.c > +++ b/sound/usb/mixer_quirks.c > @@ -26,6 +26,7 @@ > */ > > #include > +#include > #include > #include > > -- > 1.7.0.3 > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ >