From: Tejun Heo <tj@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Greg Kroah-Hartman <gregkh@suse•de>,
Mauro Carvalho Chehab <mchehab@infradead•org>
Subject: Re: [PATCH 05/17] staging: update gfp/slab.h includes
Date: Mon, 05 Apr 2010 11:27:38 +0900 [thread overview]
Message-ID: <4BB94A9A.5090808@kernel.org> (raw)
In-Reply-To: <20100403123629.d1148066.sfr@canb.auug.org.au>
Hello,
On 04/03/2010 10:36 AM, Stephen Rothwell wrote:
> On Tue, 30 Mar 2010 02:52:33 +0900 Tejun Heo <tj@kernel•org> 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
next prev parent reply other threads:[~2010-04-05 2:27 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
2010-03-29 17:52 ` [PATCH 01/17] sound: " Tejun Heo
2010-03-29 19:29 ` Takashi Iwai
2010-03-29 17:52 ` [PATCH 02/17] kdb: " Tejun Heo
2010-05-19 15:33 ` Stephen Rothwell
2010-05-19 15:50 ` Jason Wessel
2010-03-29 17:52 ` [PATCH 03/17] fsnotify: " Tejun Heo
2010-05-19 15:36 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 04/17] ocfs2: " Tejun Heo
2010-05-19 15:38 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 05/17] staging: " Tejun Heo
2010-04-03 1:36 ` Stephen Rothwell
2010-04-03 1:43 ` [PATCH 05a/17] v4l-dvb: " Stephen Rothwell
2010-05-20 1:48 ` Stephen Rothwell
2010-04-05 2:27 ` Tejun Heo [this message]
2010-03-29 17:52 ` [PATCH 06/17] vbus: " Tejun Heo
2010-03-31 11:51 ` Gregory Haskins
2010-05-19 15:42 ` Stephen Rothwell
2010-05-19 16:56 ` Gregory Haskins
2010-05-19 20:31 ` Gregory Haskins
2010-03-29 17:52 ` [PATCH 07/17] usb: " Tejun Heo
2010-05-19 15:44 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 08/17] davinci: " Tejun Heo
2010-05-19 15:45 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 09/17] pcmcia: " Tejun Heo
2010-03-29 19:32 ` Dominik Brodowski
2010-03-29 23:31 ` Stephen Rothwell
2010-03-30 1:01 ` Tejun Heo
2010-03-30 6:36 ` Dominik Brodowski
2010-03-30 6:56 ` Dmitry Torokhov
2010-03-30 8:23 ` Stephen Rothwell
2010-03-30 8:22 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 10/17] wireless: " Tejun Heo
2010-05-19 9:02 ` Stephen Rothwell
2010-05-19 14:45 ` John W. Linville
2010-05-19 15:28 ` Stephen Rothwell
2010-05-19 15:46 ` Tejun Heo
2010-05-19 16:31 ` Stephen Rothwell
2010-05-19 16:47 ` Tejun Heo
2010-05-19 15:50 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 11/17] mtd: " Tejun Heo
2010-05-19 15:51 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 12/17] mfd: " Tejun Heo
2010-04-02 10:12 ` Samuel Ortiz
2010-04-02 16:08 ` Mark Brown
2010-04-02 16:25 ` Samuel Ortiz
2010-04-03 0:07 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 13/17] hid: " Tejun Heo
2010-03-29 22:34 ` Jiri Kosina
2010-03-30 0:19 ` Tejun Heo
2010-03-29 17:52 ` [PATCH 14/17] input: " Tejun Heo
2010-03-30 3:21 ` Stephen Rothwell
2010-03-30 12:17 ` Tejun Heo
2010-03-30 13:29 ` Tejun Heo
2010-03-30 13:43 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 15/17] libata: " Tejun Heo
2010-03-29 20:14 ` Jeff Garzik
2010-03-30 0:19 ` Tejun Heo
2010-03-30 17:02 ` Jeff Garzik
2010-03-30 22:39 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 16/17] acpi: " Tejun Heo
2010-05-19 15:54 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 17/17] arm: " Tejun Heo
2010-05-19 15:56 ` Stephen Rothwell
2010-05-19 17:56 ` Russell King - ARM Linux
2010-04-06 2:30 ` [PATCHSET linux-next] " Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BB94A9A.5090808@kernel.org \
--to=tj@kernel$(echo .)org \
--cc=gregkh@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox