From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: Re: [PATCH 05/17] staging: update gfp/slab.h includes Date: Mon, 05 Apr 2010 11:27:38 +0900 Message-ID: <4BB94A9A.5090808@kernel.org> References: <1269885165-18617-1-git-send-email-tj@kernel.org> <1269885165-18617-6-git-send-email-tj@kernel.org> <20100403123629.d1148066.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from hera.kernel.org ([140.211.167.34]:52577 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753947Ab0DEC1t (ORCPT ); Sun, 4 Apr 2010 22:27:49 -0400 In-Reply-To: <20100403123629.d1148066.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Mauro Carvalho Chehab Hello, On 04/03/2010 10:36 AM, Stephen Rothwell wrote: > On Tue, 30 Mar 2010 02:52:33 +0900 Tejun Heo wrote: >> >> drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + >> drivers/staging/otus/usbdrv.h | 1 + > > The changes to those two files are fixes mainline so should go into your > slabh tree. The first one is false positive caused by addition of semaphore.h inclusion in linux-next transiting quatech_daqp_cs.c from ERR to auto edit candidate. I applied the second one to slabh. I'll also pull in -rc3 and do some merge testing. If nothing else breaks, I'll ask Linus to pull in slabh. Thanks. -- tejun