* [PATCHSET linux-next] update gfp/slab.h includes
@ 2010-03-29 17:52 Tejun Heo
2010-03-29 17:52 ` [PATCH 01/17] sound: " Tejun Heo
` (17 more replies)
0 siblings, 18 replies; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel
Mainline is scheduled to be updated not to include slab.h implicitly
from percpu.h which means that each .c file which uses gfp or slab API
should include respective header file directly.
This patchset contains include updates for trees which are in
linux-next but not in mainline yet. These patches are on top of
next-20100329 which already include Stephen's fixup patches. Please
apply both Stephen's patches and these to subsystem trees.
One good news is that all the problems Stephen discovered by build
testing and discovered by running slabh-sweep.py script on linux-next
are confined to codes which are not in mainline yet, so it looks like
the original conversion is fairly comprehensive.
This patchset contains the following patches.
0001-sound-update-gfp-slab.h-includes.patch
0002-kdb-update-gfp-slab.h-includes.patch
0003-fsnotify-update-gfp-slab.h-includes.patch
0004-ocfs2-update-gfp-slab.h-includes.patch
0005-staging-update-gfp-slab.h-includes.patch
0006-vbus-update-gfp-slab.h-includes.patch
0007-usb-update-gfp-slab.h-includes.patch
0008-davinci-update-gfp-slab.h-includes.patch
0009-pcmcia-update-gfp-slab.h-includes.patch
0010-wireless-update-gfp-slab.h-includes.patch
0011-mtd-update-gfp-slab.h-includes.patch
0012-mfd-update-gfp-slab.h-includes.patch
0013-hid-update-gfp-slab.h-includes.patch
0014-input-update-gfp-slab.h-includes.patch
0015-libata-update-gfp-slab.h-includes.patch
0016-acpi-update-gfp-slab.h-includes.patch
0017-arm-update-gfp-slab.h-includes.patch
and contains the following changes.
arch/arm/mach-vexpress/ct-ca9x4.c | 1 +
drivers/acpi/apei/apei-base.c | 1 +
drivers/acpi/atomicio.c | 1 +
drivers/ata/ahci_platform.c | 1 +
drivers/ata/libahci.c | 1 +
drivers/char/sysrq.c | 2 +-
drivers/gpio/rdc321x-gpio.c | 1 +
drivers/hid/hid-roccat-kone.c | 1 +
drivers/isdn/hardware/avm/avm_cs.c | 1 -
drivers/mfd/davinci_voicecodec.c | 1 +
drivers/mtd/mtdcore.c | 1 +
drivers/mtd/nand/mpc5121_nfc.c | 1 +
drivers/mtd/nand/r852.c | 1 +
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 +
drivers/pcmcia/pcmcia_cis.c | 1 +
drivers/pcmcia/rsrc_iodyn.c | 1 +
drivers/rtc/rtc-davinci.c | 1 +
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 +
drivers/staging/otus/usbdrv.h | 1 +
drivers/staging/tm6000/tm6000-alsa.c | 1 +
drivers/staging/tm6000/tm6000-cards.c | 1 +
drivers/staging/tm6000/tm6000-core.c | 1 +
drivers/staging/tm6000/tm6000-dvb.c | 1 +
drivers/usb/musb/musb_debugfs.c | 1 -
drivers/vbus/pci-bridge.c | 1 +
fs/notify/fanotify/fanotify_user.c | 1 +
fs/notify/mark.c | 1 -
fs/notify/vfsmount_mark.c | 1 -
fs/ocfs2/reservations.c | 1 -
kernel/debug/kdb/kdb_main.c | 1 +
sound/soc/codecs/cq93vc.c | 1 +
sound/soc/davinci/davinci-vcif.c | 1 +
sound/usb/caiaq/input.c | 1 +
sound/usb/urb.c | 1 +
35 files changed, 30 insertions(+), 6 deletions(-)
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* [PATCH 01/17] sound: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-03-29 19:29 ` Takashi Iwai
2010-03-29 17:52 ` [PATCH 02/17] kdb: " Tejun Heo
` (16 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Takashi Iwai
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takashi Iwai <tiwai@suse.de>
---
sound/soc/codecs/cq93vc.c | 1 +
sound/soc/davinci/davinci-vcif.c | 1 +
sound/usb/caiaq/input.c | 1 +
sound/usb/urb.c | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
index 5132974..8f19b93 100644
--- a/sound/soc/codecs/cq93vc.c
+++ b/sound/soc/codecs/cq93vc.c
@@ -27,6 +27,7 @@
#include <linux/pm.h>
#include <linux/platform_device.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/clk.h>
#include <linux/mfd/davinci_voicecodec.h>
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index 54b91e1..9aa980d 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
@@ -24,6 +24,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include <linux/io.h>
#include <linux/mfd/davinci_voicecodec.h>
diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
index 27ed0bc..8bbfbfd 100644
--- a/sound/usb/caiaq/input.c
+++ b/sound/usb/caiaq/input.c
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/gfp.h>
#include <linux/init.h>
#include <linux/usb.h>
#include <linux/usb/input.h>
diff --git a/sound/usb/urb.c b/sound/usb/urb.c
index e2b7c47..5570a2b 100644
--- a/sound/usb/urb.c
+++ b/sound/usb/urb.c
@@ -15,6 +15,7 @@
*
*/
+#include <linux/gfp.h>
#include <linux/init.h>
#include <linux/usb.h>
#include <linux/usb/audio.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 02/17] kdb: update gfp/slab.h includes
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 17:52 ` Tejun Heo
2010-05-19 15:33 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 03/17] fsnotify: " Tejun Heo
` (15 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Jason Wessel
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jason Wessel <jason.wessel@windriver.com>
---
kernel/debug/kdb/kdb_main.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index bad8e63..ec29a9d 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -37,6 +37,7 @@
#include <linux/kdebug.h>
#include <linux/proc_fs.h>
#include <linux/uaccess.h>
+#include <linux/slab.h>
#include "kdb_private.h"
#define GREP_LEN 256
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 03/17] fsnotify: update gfp/slab.h includes
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 17:52 ` [PATCH 02/17] kdb: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:36 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 04/17] ocfs2: " Tejun Heo
` (14 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Eric Paris
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>
---
fs/notify/fanotify/fanotify_user.c | 1 +
fs/notify/mark.c | 1 -
fs/notify/vfsmount_mark.c | 1 -
3 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 7c869fa..c437bd4 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -10,6 +10,7 @@
#include <linux/poll.h>
#include <linux/security.h>
#include <linux/syscalls.h>
+#include <linux/slab.h>
#include <linux/types.h>
#include <linux/uaccess.h>
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 1e824e6..4fd74ba 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -87,7 +87,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mutex.h>
-#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/writeback.h> /* for inode_lock */
diff --git a/fs/notify/vfsmount_mark.c b/fs/notify/vfsmount_mark.c
index 8f1aa02..ec580a2 100644
--- a/fs/notify/vfsmount_mark.c
+++ b/fs/notify/vfsmount_mark.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/mount.h>
#include <linux/mutex.h>
-#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/writeback.h> /* for inode_lock */
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 04/17] ocfs2: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (2 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 03/17] fsnotify: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:38 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 05/17] staging: " Tejun Heo
` (13 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Joel Becker
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joel Becker <joel.becker@oracle.com>
---
fs/ocfs2/reservations.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c
index 7fc6cfe..ed59559 100644
--- a/fs/ocfs2/reservations.c
+++ b/fs/ocfs2/reservations.c
@@ -26,7 +26,6 @@
#include <linux/fs.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/bitops.h>
#include <linux/list.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 05/17] staging: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (3 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 04/17] ocfs2: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-04-03 1:36 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 06/17] vbus: " Tejun Heo
` (12 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Greg Kroah-Hartman
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 +
drivers/staging/otus/usbdrv.h | 1 +
drivers/staging/tm6000/tm6000-alsa.c | 1 +
drivers/staging/tm6000/tm6000-cards.c | 1 +
drivers/staging/tm6000/tm6000-core.c | 1 +
drivers/staging/tm6000/tm6000-dvb.c | 1 +
6 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 92d7b72..ab00846 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -49,6 +49,7 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
#include "../comedidev.h"
#include <linux/semaphore.h>
+#include <linux/slab.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
diff --git a/drivers/staging/otus/usbdrv.h b/drivers/staging/otus/usbdrv.h
index 330d1b9..7e66c2d 100644
--- a/drivers/staging/otus/usbdrv.h
+++ b/drivers/staging/otus/usbdrv.h
@@ -38,6 +38,7 @@
#include <linux/uaccess.h>
#include <linux/wireless.h>
#include <linux/if_arp.h>
+#include <linux/slab.h>
#include <linux/io.h>
#include "zdcompat.h"
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index bc89f9d..3404516 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -15,6 +15,7 @@
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/usb.h>
+#include <linux/slab.h>
#include <asm/delay.h>
#include <sound/core.h>
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 2053008..2935533 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -24,6 +24,7 @@
#include <linux/i2c.h>
#include <linux/usb.h>
#include <linux/version.h>
+#include <linux/slab.h>
#include <media/v4l2-common.h>
#include <media/tuner.h>
#include <media/tvaudio.h>
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index d9cade0..2ae7ae0 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/i2c.h>
#include "tm6000.h"
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index 1072206..dfba5e6 100644
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -18,6 +18,7 @@
*/
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include "tm6000.h"
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 06/17] vbus: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (4 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 05/17] staging: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-03-31 11:51 ` Gregory Haskins
2010-03-29 17:52 ` [PATCH 07/17] usb: " Tejun Heo
` (11 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Gregory Haskins
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gregory Haskins <ghaskins@novell.com>
---
drivers/vbus/pci-bridge.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
index 0d51324..36de7c4 100644
--- a/drivers/vbus/pci-bridge.c
+++ b/drivers/vbus/pci-bridge.c
@@ -22,6 +22,7 @@
#include <linux/pci.h>
#include <linux/mm.h>
#include <linux/workqueue.h>
+#include <linux/slab.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/ioq.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 07/17] usb: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (5 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 06/17] vbus: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:44 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 08/17] davinci: " Tejun Heo
` (10 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Greg Kroah-Hartman
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/musb/musb_debugfs.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index b6a27ba..3310b52 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -34,7 +34,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/slab.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/kobject.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 08/17] davinci: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (6 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 07/17] usb: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:45 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 09/17] pcmcia: " Tejun Heo
` (9 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Kevin Hilman
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---
drivers/rtc/rtc-davinci.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index 92a8f6c..34647fc 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -29,6 +29,7 @@
#include <linux/bcd.h>
#include <linux/platform_device.h>
#include <linux/io.h>
+#include <linux/slab.h>
/*
* The DaVinci RTC is a simple RTC with the following
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (7 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 08/17] davinci: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-03-29 19:32 ` Dominik Brodowski
2010-03-29 17:52 ` [PATCH 10/17] wireless: " Tejun Heo
` (8 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Dominik Brodowski
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
---
drivers/isdn/hardware/avm/avm_cs.c | 1 -
drivers/pcmcia/pcmcia_cis.c | 1 +
drivers/pcmcia/rsrc_iodyn.c | 1 +
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 8bbc452..f410d0e 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/ptrace.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/tty.h>
#include <linux/serial.h>
diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c
index 7406387..4a65eaf 100644
--- a/drivers/pcmcia/pcmcia_cis.c
+++ b/drivers/pcmcia/pcmcia_cis.c
@@ -14,6 +14,7 @@
*
*/
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index 7791375..d0bf350 100644
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -12,6 +12,7 @@
* (C) 1999 David A. Hinds
*/
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 10/17] wireless: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (8 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 09/17] pcmcia: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 9:02 ` Stephen Rothwell
2010-05-19 15:50 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 11/17] mtd: " Tejun Heo
` (7 subsequent siblings)
17 siblings, 2 replies; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, John W. Linville
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 7770649..4497479 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -23,6 +23,7 @@
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/leds.h>
+#include <linux/slab.h>
#include <net/mac80211.h>
#include "common.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
index 4c5395e..0cc7fd9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
@@ -30,6 +30,7 @@
#include <linux/module.h>
#include <linux/etherdevice.h>
#include <linux/sched.h>
+#include <linux/gfp.h>
#include <net/mac80211.h>
#include "iwl-dev.h"
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 11/17] mtd: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (9 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 10/17] wireless: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:51 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 12/17] mfd: " Tejun Heo
` (6 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, David Woodhouse
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Woodhouse <dwmw2@infradead.org>
---
drivers/mtd/mtdcore.c | 1 +
drivers/mtd/nand/mpc5121_nfc.c | 1 +
drivers/mtd/nand/r852.c | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index e8573c9..3c48193 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -17,6 +17,7 @@
#include <linux/mtd/compatmac.h>
#include <linux/proc_fs.h>
#include <linux/idr.h>
+#include <linux/gfp.h>
#include <linux/mtd/mtd.h>
#include "internal.h"
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index d7333f4..1a06f78 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -27,6 +27,7 @@
#include <linux/module.h>
#include <linux/clk.h>
+#include <linux/gfp.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 96bfbd8..dd5158c 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -15,6 +15,7 @@
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include <asm/byteorder.h>
#include <linux/sched.h>
#include "sm_common.h"
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 12/17] mfd: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (10 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 11/17] mtd: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-04-02 10:12 ` Samuel Ortiz
2010-03-29 17:52 ` [PATCH 13/17] hid: " Tejun Heo
` (5 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Samuel Ortiz
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
drivers/gpio/rdc321x-gpio.c | 1 +
drivers/mfd/davinci_voicecodec.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index 46c5519..e344907 100644
--- a/drivers/gpio/rdc321x-gpio.c
+++ b/drivers/gpio/rdc321x-gpio.c
@@ -27,6 +27,7 @@
#include <linux/pci.h>
#include <linux/gpio.h>
#include <linux/mfd/rdc321x.h>
+#include <linux/slab.h>
struct rdc321x_gpio {
spinlock_t lock;
diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index 9886aa8..3e75f02 100644
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -23,6 +23,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/clk.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 13/17] hid: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (11 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 12/17] mfd: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-03-29 22:34 ` Jiri Kosina
2010-03-29 17:52 ` [PATCH 14/17] input: " Tejun Heo
` (4 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Jiri Kosina
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jkosina@suse.cz>
---
drivers/hid/hid-roccat-kone.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 2b1412e..7b11784 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -35,6 +35,7 @@
#include <linux/hid.h>
#include <linux/usb.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include "hid-ids.h"
#include "hid-roccat-kone.h"
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 14/17] input: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (12 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 13/17] hid: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-03-30 3:21 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 15/17] libata: " Tejun Heo
` (3 subsequent siblings)
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Dmitry Torokhov
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/char/sysrq.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 532c56c..593562d 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -41,7 +41,7 @@
#include <linux/hrtimer.h>
#include <linux/oom.h>
#include <linux/input.h>
-#include <linux/gfp.h>
+#include <linux/slab.h>
#include <asm/ptrace.h>
#include <asm/irq_regs.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 15/17] libata: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (13 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 14/17] input: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-03-29 20:14 ` Jeff Garzik
2010-03-30 17:02 ` Jeff Garzik
2010-03-29 17:52 ` [PATCH 16/17] acpi: " Tejun Heo
` (2 subsequent siblings)
17 siblings, 2 replies; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Jeff Garzik
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeff Garzik <jgarzik@pobox.com>
---
drivers/ata/ahci_platform.c | 1 +
drivers/ata/libahci.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 42cdd73..19bfd1d 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -13,6 +13,7 @@
*/
#include <linux/kernel.h>
+#include <linux/gfp.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 3f586ec..34fc57d 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -33,6 +33,7 @@
*/
#include <linux/kernel.h>
+#include <linux/gfp.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/blkdev.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 16/17] acpi: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (14 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 15/17] libata: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:54 ` Stephen Rothwell
2010-03-29 17:52 ` [PATCH 17/17] arm: " Tejun Heo
2010-04-06 2:30 ` [PATCHSET linux-next] " Tejun Heo
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Len Brown
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Len Brown <lenb@kernel.org>
---
drivers/acpi/apei/apei-base.c | 1 +
drivers/acpi/atomicio.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index c35fec7..2672880 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -34,6 +34,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/acpi.h>
+#include <linux/slab.h>
#include <linux/io.h>
#include <linux/kref.h>
#include <linux/rculist.h>
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
index 4ed1385..e21b1e4 100644
--- a/drivers/acpi/atomicio.c
+++ b/drivers/acpi/atomicio.c
@@ -31,6 +31,7 @@
#include <linux/kref.h>
#include <linux/rculist.h>
#include <linux/interrupt.h>
+#include <linux/slab.h>
#include <acpi/atomicio.h>
#define ACPI_PFX "ACPI: "
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [PATCH 17/17] arm: update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (15 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 16/17] acpi: " Tejun Heo
@ 2010-03-29 17:52 ` Tejun Heo
2010-05-19 15:56 ` Stephen Rothwell
2010-04-06 2:30 ` [PATCHSET linux-next] " Tejun Heo
17 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-29 17:52 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel; +Cc: Tejun Heo, Russell King
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Russell King <linux@arm.linux.org.uk>
---
arch/arm/mach-vexpress/ct-ca9x4.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 5a0449c..b4b0bb4 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -2,6 +2,7 @@
* Versatile Express Core Tile Cortex A9x4 Support
*/
#include <linux/init.h>
+#include <linux/gfp.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/amba/bus.h>
--
1.6.4.2
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 01/17] sound: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 01/17] sound: " Tejun Heo
@ 2010-03-29 19:29 ` Takashi Iwai
0 siblings, 0 replies; 72+ messages in thread
From: Takashi Iwai @ 2010-03-29 19:29 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-next, linux-kernel
At Tue, 30 Mar 2010 02:52:29 +0900,
Tejun Heo wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Takashi Iwai <tiwai@suse.de>
Thanks, applied now to sound git tree.
Takashi
> ---
> sound/soc/codecs/cq93vc.c | 1 +
> sound/soc/davinci/davinci-vcif.c | 1 +
> sound/usb/caiaq/input.c | 1 +
> sound/usb/urb.c | 1 +
> 4 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
> index 5132974..8f19b93 100644
> --- a/sound/soc/codecs/cq93vc.c
> +++ b/sound/soc/codecs/cq93vc.c
> @@ -27,6 +27,7 @@
> #include <linux/pm.h>
> #include <linux/platform_device.h>
> #include <linux/device.h>
> +#include <linux/slab.h>
> #include <linux/clk.h>
> #include <linux/mfd/davinci_voicecodec.h>
>
> diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
> index 54b91e1..9aa980d 100644
> --- a/sound/soc/davinci/davinci-vcif.c
> +++ b/sound/soc/davinci/davinci-vcif.c
> @@ -24,6 +24,7 @@
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/delay.h>
> +#include <linux/slab.h>
> #include <linux/io.h>
> #include <linux/mfd/davinci_voicecodec.h>
>
> diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
> index 27ed0bc..8bbfbfd 100644
> --- a/sound/usb/caiaq/input.c
> +++ b/sound/usb/caiaq/input.c
> @@ -16,6 +16,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> +#include <linux/gfp.h>
> #include <linux/init.h>
> #include <linux/usb.h>
> #include <linux/usb/input.h>
> diff --git a/sound/usb/urb.c b/sound/usb/urb.c
> index e2b7c47..5570a2b 100644
> --- a/sound/usb/urb.c
> +++ b/sound/usb/urb.c
> @@ -15,6 +15,7 @@
> *
> */
>
> +#include <linux/gfp.h>
> #include <linux/init.h>
> #include <linux/usb.h>
> #include <linux/usb/audio.h>
> --
> 1.6.4.2
>
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
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
0 siblings, 1 reply; 72+ messages in thread
From: Dominik Brodowski @ 2010-03-29 19:32 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-next, linux-kernel, netdev
On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
> ---
> drivers/isdn/hardware/avm/avm_cs.c | 1 -
> drivers/pcmcia/pcmcia_cis.c | 1 +
> drivers/pcmcia/rsrc_iodyn.c | 1 +
> 3 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
> index 8bbc452..f410d0e 100644
> --- a/drivers/isdn/hardware/avm/avm_cs.c
> +++ b/drivers/isdn/hardware/avm/avm_cs.c
> @@ -13,7 +13,6 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/ptrace.h>
> -#include <linux/slab.h>
> #include <linux/string.h>
> #include <linux/tty.h>
> #include <linux/serial.h>
> diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c
> index 7406387..4a65eaf 100644
> --- a/drivers/pcmcia/pcmcia_cis.c
> +++ b/drivers/pcmcia/pcmcia_cis.c
> @@ -14,6 +14,7 @@
> *
> */
>
> +#include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/netdevice.h>
> diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
> index 7791375..d0bf350 100644
> --- a/drivers/pcmcia/rsrc_iodyn.c
> +++ b/drivers/pcmcia/rsrc_iodyn.c
> @@ -12,6 +12,7 @@
> * (C) 1999 David A. Hinds
> */
>
> +#include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
>
> --
> 1.6.4.2
>
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 15/17] libata: update gfp/slab.h includes
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
1 sibling, 1 reply; 72+ messages in thread
From: Jeff Garzik @ 2010-03-29 20:14 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-next, linux-kernel
On 03/29/2010 01:52 PM, Tejun Heo wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo<tj@kernel.org>
> Cc: Stephen Rothwell<sfr@canb.auug.org.au>
> Cc: Jeff Garzik<jgarzik@pobox.com>
> ---
> drivers/ata/ahci_platform.c | 1 +
> drivers/ata/libahci.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
Unless you object, I'll go ahead and apply this to #upstream...
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 13/17] hid: update gfp/slab.h includes
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
0 siblings, 1 reply; 72+ messages in thread
From: Jiri Kosina @ 2010-03-29 22:34 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-next, linux-kernel
On Tue, 30 Mar 2010, Tejun Heo wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Jiri Kosina <jkosina@suse.cz>
> ---
> drivers/hid/hid-roccat-kone.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
> index 2b1412e..7b11784 100644
> --- a/drivers/hid/hid-roccat-kone.c
> +++ b/drivers/hid/hid-roccat-kone.c
> @@ -35,6 +35,7 @@
> #include <linux/hid.h>
> #include <linux/usb.h>
> #include <linux/module.h>
> +#include <linux/slab.h>
> #include "hid-ids.h"
> #include "hid-roccat-kone.h"
I have applied this to the branch of my tree in which development of
roccat-kone driver for 2.6.35 is happening.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-29 19:32 ` Dominik Brodowski
@ 2010-03-29 23:31 ` Stephen Rothwell
2010-03-30 1:01 ` Tejun Heo
0 siblings, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-03-29 23:31 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: Tejun Heo, linux-next, linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 775 bytes --]
Hi Dominik,
On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
>
> On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> >
> > Signed-off-by: Tejun Heo <tj@kernel.org>
> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
The plan here is for you to put this in your tree now. It is safe to do
so and Tejun can't carry it because this does not apply to mainline.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 15/17] libata: update gfp/slab.h includes
2010-03-29 20:14 ` Jeff Garzik
@ 2010-03-30 0:19 ` Tejun Heo
0 siblings, 0 replies; 72+ messages in thread
From: Tejun Heo @ 2010-03-30 0:19 UTC (permalink / raw)
To: Jeff Garzik; +Cc: sfr, linux-next, linux-kernel
On 03/30/2010 05:14 AM, Jeff Garzik wrote:
> On 03/29/2010 01:52 PM, Tejun Heo wrote:
>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>> gfp.h or slab.h is included as necessary.
>
> Unless you object, I'll go ahead and apply this to #upstream...
Yes, please.
Thank you.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 13/17] hid: update gfp/slab.h includes
2010-03-29 22:34 ` Jiri Kosina
@ 2010-03-30 0:19 ` Tejun Heo
0 siblings, 0 replies; 72+ messages in thread
From: Tejun Heo @ 2010-03-30 0:19 UTC (permalink / raw)
To: Jiri Kosina; +Cc: sfr, linux-next, linux-kernel
On 03/30/2010 07:34 AM, Jiri Kosina wrote:
> I have applied this to the branch of my tree in which development of
> roccat-kone driver for 2.6.35 is happening.
Great, thanks. :-)
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-29 23:31 ` Stephen Rothwell
@ 2010-03-30 1:01 ` Tejun Heo
2010-03-30 6:36 ` Dominik Brodowski
0 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-30 1:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Dominik Brodowski, linux-next, linux-kernel, netdev
Hello,
On 03/30/2010 08:31 AM, Stephen Rothwell wrote:
> Hi Dominik,
> On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
>>
>> On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
>>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>>> gfp.h or slab.h is included as necessary.
>>>
>>> Signed-off-by: Tejun Heo <tj@kernel.org>
>>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>>> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
>> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
>
> The plan here is for you to put this in your tree now. It is safe to do
> so and Tejun can't carry it because this does not apply to mainline.
Yeap, something I completely forgot about when I asked Stephen to pull
from the slabh tree. It would be great if you can apply this one and
Stephen's patches on drivers/input/misc/ad714x.c and pcf8574_keypad.c
into input tree.
Thank you.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 14/17] input: update gfp/slab.h includes
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
0 siblings, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-03-30 3:21 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-next, linux-kernel, Dmitry Torokhov
[-- Attachment #1: Type: text/plain, Size: 1106 bytes --]
Hi Tejun,
On Tue, 30 Mar 2010 02:52:42 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/char/sysrq.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
> index 532c56c..593562d 100644
> --- a/drivers/char/sysrq.c
> +++ b/drivers/char/sysrq.c
> @@ -41,7 +41,7 @@
> #include <linux/hrtimer.h>
> #include <linux/oom.h>
> #include <linux/input.h>
> -#include <linux/gfp.h>
> +#include <linux/slab.h>
>
> #include <asm/ptrace.h>
> #include <asm/irq_regs.h>
This patch does not apply to the input tree. That tree does not have the
#include <linux/gfp.h>
line (your tree (slabh) adds that later in the linux-next cycle).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-30 1:01 ` Tejun Heo
@ 2010-03-30 6:36 ` Dominik Brodowski
2010-03-30 6:56 ` Dmitry Torokhov
` (2 more replies)
0 siblings, 3 replies; 72+ messages in thread
From: Dominik Brodowski @ 2010-03-30 6:36 UTC (permalink / raw)
To: Tejun Heo, Dmitry Torokhov
Cc: Stephen Rothwell, linux-next, linux-kernel, netdev
On Tue, Mar 30, 2010 at 10:01:47AM +0900, Tejun Heo wrote:
> Hello,
>
> On 03/30/2010 08:31 AM, Stephen Rothwell wrote:
> > Hi Dominik,
> > On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> >>
> >> On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
> >>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> >>> gfp.h or slab.h is included as necessary.
> >>>
> >>> Signed-off-by: Tejun Heo <tj@kernel.org>
> >>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> >>> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> >> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
> >
> > The plan here is for you to put this in your tree now. It is safe to do
> > so and Tejun can't carry it because this does not apply to mainline.
Okay, applied it.
> Stephen's patches on drivers/input/misc/ad714x.c and pcf8574_keypad.c
> into input tree.
That's nothing I can do anything about -- Dmitry?
Best,
Dominik
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-30 6:36 ` Dominik Brodowski
@ 2010-03-30 6:56 ` Dmitry Torokhov
2010-03-30 6:56 ` Dmitry Torokhov
2010-03-30 8:22 ` Stephen Rothwell
2 siblings, 0 replies; 72+ messages in thread
From: Dmitry Torokhov @ 2010-03-30 6:56 UTC (permalink / raw)
To: Dominik Brodowski, Tejun Heo, Stephen Rothwell, linux-next,
linux-kernel, netdev
On Tue, Mar 30, 2010 at 08:36:09AM +0200, Dominik Brodowski wrote:
> On Tue, Mar 30, 2010 at 10:01:47AM +0900, Tejun Heo wrote:
> > Hello,
> >
> > On 03/30/2010 08:31 AM, Stephen Rothwell wrote:
> > > Hi Dominik,
> > > On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> > >>
> > >> On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
> > >>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > >>> gfp.h or slab.h is included as necessary.
> > >>>
> > >>> Signed-off-by: Tejun Heo <tj@kernel.org>
> > >>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > >>> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> > >> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
> > >
> > > The plan here is for you to put this in your tree now. It is safe to do
> > > so and Tejun can't carry it because this does not apply to mainline.
>
> Okay, applied it.
>
> > Stephen's patches on drivers/input/misc/ad714x.c and pcf8574_keypad.c
> > into input tree.
>
> That's nothing I can do anything about -- Dmitry?
>
Yes, I will roll teh relevant parts into respective patches if you don't
mind.
--
Dmitry
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-30 6:36 ` Dominik Brodowski
2010-03-30 6:56 ` Dmitry Torokhov
@ 2010-03-30 6:56 ` Dmitry Torokhov
2010-03-30 8:22 ` Stephen Rothwell
2 siblings, 0 replies; 72+ messages in thread
From: Dmitry Torokhov @ 2010-03-30 6:56 UTC (permalink / raw)
To: Dominik Brodowski, Tejun Heo, Stephen Rothwell, linux-next,
linux-kernel, netdev
On Tue, Mar 30, 2010 at 08:36:09AM +0200, Dominik Brodowski wrote:
> On Tue, Mar 30, 2010 at 10:01:47AM +0900, Tejun Heo wrote:
> > Hello,
> >
> > On 03/30/2010 08:31 AM, Stephen Rothwell wrote:
> > > Hi Dominik,
> > > On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> > >>
> > >> On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
> > >>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > >>> gfp.h or slab.h is included as necessary.
> > >>>
> > >>> Signed-off-by: Tejun Heo <tj@kernel.org>
> > >>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > >>> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> > >> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
> > >
> > > The plan here is for you to put this in your tree now. It is safe to do
> > > so and Tejun can't carry it because this does not apply to mainline.
>
> Okay, applied it.
>
> > Stephen's patches on drivers/input/misc/ad714x.c and pcf8574_keypad.c
> > into input tree.
>
> That's nothing I can do anything about -- Dmitry?
>
Yes, I will roll teh relevant parts into respective patches if you don't
mind.
--
Dmitry
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
@ 2010-03-30 6:56 ` Dmitry Torokhov
0 siblings, 0 replies; 72+ messages in thread
From: Dmitry Torokhov @ 2010-03-30 6:56 UTC (permalink / raw)
To: Dominik Brodowski, Tejun Heo, Stephen Rothwell, linux-next,
linux-kernel, netdev
On Tue, Mar 30, 2010 at 08:36:09AM +0200, Dominik Brodowski wrote:
> On Tue, Mar 30, 2010 at 10:01:47AM +0900, Tejun Heo wrote:
> > Hello,
> >
> > On 03/30/2010 08:31 AM, Stephen Rothwell wrote:
> > > Hi Dominik,
> > > On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> > >>
> > >> On Tue, Mar 30, 2010 at 02:52:37AM +0900, Tejun Heo wrote:
> > >>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > >>> gfp.h or slab.h is included as necessary.
> > >>>
> > >>> Signed-off-by: Tejun Heo <tj@kernel.org>
> > >>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > >>> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> > >> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
> > >
> > > The plan here is for you to put this in your tree now. It is safe to do
> > > so and Tejun can't carry it because this does not apply to mainline.
>
> Okay, applied it.
>
> > Stephen's patches on drivers/input/misc/ad714x.c and pcf8574_keypad.c
> > into input tree.
>
> That's nothing I can do anything about -- Dmitry?
>
Yes, I will roll teh relevant parts into respective patches if you don't
mind.
--
Dmitry
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-30 6:36 ` Dominik Brodowski
2010-03-30 6:56 ` Dmitry Torokhov
2010-03-30 6:56 ` Dmitry Torokhov
@ 2010-03-30 8:22 ` Stephen Rothwell
2 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-03-30 8:22 UTC (permalink / raw)
To: Dominik Brodowski
Cc: Tejun Heo, Dmitry Torokhov, linux-next, linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
Hi Dominik,
On Tue, 30 Mar 2010 08:36:09 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
>
> Okay, applied it.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
2010-03-30 6:56 ` Dmitry Torokhov
(?)
@ 2010-03-30 8:23 ` Stephen Rothwell
-1 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-03-30 8:23 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Dominik Brodowski, Tejun Heo, linux-next, linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
Hi Dmitry,
On Mon, 29 Mar 2010 23:56:05 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> Yes, I will roll teh relevant parts into respective patches if you don't
> mind.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 14/17] input: update gfp/slab.h includes
2010-03-30 3:21 ` Stephen Rothwell
@ 2010-03-30 12:17 ` Tejun Heo
2010-03-30 13:29 ` Tejun Heo
0 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-30 12:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dmitry Torokhov
Hello,
On 03/30/2010 12:21 PM, Stephen Rothwell wrote:
>> diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
>> index 532c56c..593562d 100644
>> --- a/drivers/char/sysrq.c
>> +++ b/drivers/char/sysrq.c
>> @@ -41,7 +41,7 @@
>> #include <linux/hrtimer.h>
>> #include <linux/oom.h>
>> #include <linux/input.h>
>> -#include <linux/gfp.h>
>> +#include <linux/slab.h>
>>
>> #include <asm/ptrace.h>
>> #include <asm/irq_regs.h>
>
> This patch does not apply to the input tree. That tree does not have the
> #include <linux/gfp.h>
> line (your tree (slabh) adds that later in the linux-next cycle).
Ah, I see. sysrq.c's requirement changed between mainline and
linux-next. I'll update slabh tree such that it includes slab.h from
there.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 14/17] input: update gfp/slab.h includes
2010-03-30 12:17 ` Tejun Heo
@ 2010-03-30 13:29 ` Tejun Heo
2010-03-30 13:43 ` Stephen Rothwell
0 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-03-30 13:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dmitry Torokhov
Hello, again.
On 03/30/2010 09:17 PM, Tejun Heo wrote:
> Ah, I see. sysrq.c's requirement changed between mainline and
> linux-next. I'll update slabh tree such that it includes slab.h from
> there.
slabh updated such that...
* kmemcheck fix patch is placed before the patch to break implicit
slab.h inclusion.
* sysrq.c now includes slab.h instead of gfp.h.
* Updated against the current mainline
9623e5a23724d09283c238960946ec6f65733afe. Conversion script was run
again and outputs are compared. No new dependency appeared since
the last round.
So, it should now be safe to ignore this patch.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 14/17] input: update gfp/slab.h includes
2010-03-30 13:29 ` Tejun Heo
@ 2010-03-30 13:43 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-03-30 13:43 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-next, linux-kernel, Dmitry Torokhov
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
Hi Tejun,
On Tue, 30 Mar 2010 22:29:19 +0900 Tejun Heo <htejun@gmail.com> wrote:
>
> slabh updated such that...
>
> * kmemcheck fix patch is placed before the patch to break implicit
> slab.h inclusion.
>
> * sysrq.c now includes slab.h instead of gfp.h.
>
> * Updated against the current mainline
> 9623e5a23724d09283c238960946ec6f65733afe. Conversion script was run
> again and outputs are compared. No new dependency appeared since
> the last round.
>
> So, it should now be safe to ignore this patch.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 15/17] libata: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 15/17] libata: " Tejun Heo
2010-03-29 20:14 ` Jeff Garzik
@ 2010-03-30 17:02 ` Jeff Garzik
2010-03-30 22:39 ` Stephen Rothwell
1 sibling, 1 reply; 72+ messages in thread
From: Jeff Garzik @ 2010-03-30 17:02 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-next, linux-kernel
On 03/29/2010 01:52 PM, Tejun Heo wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo<tj@kernel.org>
> Cc: Stephen Rothwell<sfr@canb.auug.org.au>
> Cc: Jeff Garzik<jgarzik@pobox.com>
> ---
> drivers/ata/ahci_platform.c | 1 +
> drivers/ata/libahci.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
applied
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 15/17] libata: update gfp/slab.h includes
2010-03-30 17:02 ` Jeff Garzik
@ 2010-03-30 22:39 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-03-30 22:39 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Tejun Heo, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
Hi Jeff,
On Tue, 30 Mar 2010 13:02:51 -0400 Jeff Garzik <jgarzik@pobox.com> wrote:
>
> On 03/29/2010 01:52 PM, Tejun Heo wrote:
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> >
> > Signed-off-by: Tejun Heo<tj@kernel.org>
> > Cc: Stephen Rothwell<sfr@canb.auug.org.au>
> > Cc: Jeff Garzik<jgarzik@pobox.com>
> > ---
> > drivers/ata/ahci_platform.c | 1 +
> > drivers/ata/libahci.c | 1 +
> > 2 files changed, 2 insertions(+), 0 deletions(-)
>
> applied
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 06/17] vbus: " Tejun Heo
@ 2010-03-31 11:51 ` Gregory Haskins
0 siblings, 0 replies; 72+ messages in thread
From: Gregory Haskins @ 2010-03-31 11:51 UTC (permalink / raw)
To: sfr, Tejun Heo, linux-kernel, linux-next
>>> On 3/29/2010 at 01:52 PM, in message
<1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Gregory Haskins <ghaskins@novell.com>
Thanks Tejun,
Acked-by: Gregory Haskins <ghaskins@novell.com>
(will add to my tree)
> ---
> drivers/vbus/pci-bridge.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
> index 0d51324..36de7c4 100644
> --- a/drivers/vbus/pci-bridge.c
> +++ b/drivers/vbus/pci-bridge.c
> @@ -22,6 +22,7 @@
> #include <linux/pci.h>
> #include <linux/mm.h>
> #include <linux/workqueue.h>
> +#include <linux/slab.h>
> #include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/ioq.h
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
@ 2010-03-31 11:51 ` Gregory Haskins
0 siblings, 0 replies; 72+ messages in thread
From: Gregory Haskins @ 2010-03-31 11:51 UTC (permalink / raw)
To: sfr, Tejun Heo, linux-kernel, linux-next
>>> On 3/29/2010 at 01:52 PM, in message
<1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Gregory Haskins <ghaskins@novell.com>
Thanks Tejun,
Acked-by: Gregory Haskins <ghaskins@novell.com>
(will add to my tree)
> ---
> drivers/vbus/pci-bridge.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
> index 0d51324..36de7c4 100644
> --- a/drivers/vbus/pci-bridge.c
> +++ b/drivers/vbus/pci-bridge.c
> @@ -22,6 +22,7 @@
> #include <linux/pci.h>
> #include <linux/mm.h>
> #include <linux/workqueue.h>
> +#include <linux/slab.h>
> #include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/ioq.h
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 12/17] mfd: update gfp/slab.h includes
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
0 siblings, 1 reply; 72+ messages in thread
From: Samuel Ortiz @ 2010-04-02 10:12 UTC (permalink / raw)
To: Tejun Heo, Mark Brown; +Cc: sfr, linux-next, linux-kernel
Hi Tejun,
On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
The davinci MFD driver is sitting in Mark's tree, so I guess he should take
this patch.
Mark, feel free to add my:
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
to this patch.
Cheers,
Samuel.
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> ---
> drivers/gpio/rdc321x-gpio.c | 1 +
> drivers/mfd/davinci_voicecodec.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
> index 46c5519..e344907 100644
> --- a/drivers/gpio/rdc321x-gpio.c
> +++ b/drivers/gpio/rdc321x-gpio.c
> @@ -27,6 +27,7 @@
> #include <linux/pci.h>
> #include <linux/gpio.h>
> #include <linux/mfd/rdc321x.h>
> +#include <linux/slab.h>
>
> struct rdc321x_gpio {
> spinlock_t lock;
> diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
> index 9886aa8..3e75f02 100644
> --- a/drivers/mfd/davinci_voicecodec.c
> +++ b/drivers/mfd/davinci_voicecodec.c
> @@ -23,6 +23,7 @@
> #include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> +#include <linux/slab.h>
> #include <linux/delay.h>
> #include <linux/io.h>
> #include <linux/clk.h>
> --
> 1.6.4.2
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 12/17] mfd: update gfp/slab.h includes
2010-04-02 10:12 ` Samuel Ortiz
@ 2010-04-02 16:08 ` Mark Brown
2010-04-02 16:25 ` Samuel Ortiz
0 siblings, 1 reply; 72+ messages in thread
From: Mark Brown @ 2010-04-02 16:08 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: Tejun Heo, sfr, linux-next, linux-kernel
On Fri, Apr 02, 2010 at 12:12:00PM +0200, Samuel Ortiz wrote:
> Hi Tejun,
>
> On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> The davinci MFD driver is sitting in Mark's tree, so I guess he should take
> this patch.
> Mark, feel free to add my:
> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
> to this patch.
Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the
patch doesn't apply cleanly to ASoC either. I've applied the DaVinci
hunk, the other will need to go via your tree.
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 12/17] mfd: update gfp/slab.h includes
2010-04-02 16:08 ` Mark Brown
@ 2010-04-02 16:25 ` Samuel Ortiz
2010-04-03 0:07 ` Stephen Rothwell
0 siblings, 1 reply; 72+ messages in thread
From: Samuel Ortiz @ 2010-04-02 16:25 UTC (permalink / raw)
To: Mark Brown; +Cc: Tejun Heo, sfr, linux-next, linux-kernel
On Fri, Apr 02, 2010 at 05:08:55PM +0100, Mark Brown wrote:
> On Fri, Apr 02, 2010 at 12:12:00PM +0200, Samuel Ortiz wrote:
> > Hi Tejun,
> >
> > On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> > > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > > gfp.h or slab.h is included as necessary.
> > The davinci MFD driver is sitting in Mark's tree, so I guess he should take
> > this patch.
> > Mark, feel free to add my:
> > Acked-by: Samuel Ortiz <sameo@linux.intel.com>
>
> > to this patch.
>
> Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the
> patch doesn't apply cleanly to ASoC either. I've applied the DaVinci
> hunk, the other will need to go via your tree.
Thanks, I'm pushing the rdc321x part.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 12/17] mfd: update gfp/slab.h includes
2010-04-02 16:25 ` Samuel Ortiz
@ 2010-04-03 0:07 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-04-03 0:07 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: Mark Brown, Tejun Heo, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi Samuel, Mark,
On Fri, 2 Apr 2010 18:25:47 +0200 Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> On Fri, Apr 02, 2010 at 05:08:55PM +0100, Mark Brown wrote:
> > On Fri, Apr 02, 2010 at 12:12:00PM +0200, Samuel Ortiz wrote:
> > > Hi Tejun,
> > >
> > > On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> > > > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > > > gfp.h or slab.h is included as necessary.
> > > The davinci MFD driver is sitting in Mark's tree, so I guess he should take
> > > this patch.
> > > Mark, feel free to add my:
> > > Acked-by: Samuel Ortiz <sameo@linux.intel.com>
> >
> > > to this patch.
> >
> > Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the
> > patch doesn't apply cleanly to ASoC either. I've applied the DaVinci
> > hunk, the other will need to go via your tree.
> Thanks, I'm pushing the rdc321x part.
Thanks, guys.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 05/17] staging: update gfp/slab.h includes
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-04-05 2:27 ` [PATCH 05/17] staging: " Tejun Heo
0 siblings, 2 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-04-03 1:36 UTC (permalink / raw)
To: Tejun Heo
Cc: linux-next, linux-kernel, Greg Kroah-Hartman, Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 3390 bytes --]
Hi Tejun,
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.
> drivers/staging/tm6000/tm6000-alsa.c | 1 +
> drivers/staging/tm6000/tm6000-cards.c | 1 +
> drivers/staging/tm6000/tm6000-core.c | 1 +
> drivers/staging/tm6000/tm6000-dvb.c | 1 +
These four files are intreoduced in the v4l-dvb tree, so this part should
go to Mauro Carvalho Chehab <mchehab@infradead.org> (cc'd).
> 6 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
> index 92d7b72..ab00846 100644
> --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
> +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
> @@ -49,6 +49,7 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
>
> #include "../comedidev.h"
> #include <linux/semaphore.h>
> +#include <linux/slab.h>
>
> #include <pcmcia/cs_types.h>
> #include <pcmcia/cs.h>
> diff --git a/drivers/staging/otus/usbdrv.h b/drivers/staging/otus/usbdrv.h
> index 330d1b9..7e66c2d 100644
> --- a/drivers/staging/otus/usbdrv.h
> +++ b/drivers/staging/otus/usbdrv.h
> @@ -38,6 +38,7 @@
> #include <linux/uaccess.h>
> #include <linux/wireless.h>
> #include <linux/if_arp.h>
> +#include <linux/slab.h>
> #include <linux/io.h>
>
> #include "zdcompat.h"
> diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
> index bc89f9d..3404516 100644
> --- a/drivers/staging/tm6000/tm6000-alsa.c
> +++ b/drivers/staging/tm6000/tm6000-alsa.c
> @@ -15,6 +15,7 @@
> #include <linux/device.h>
> #include <linux/interrupt.h>
> #include <linux/usb.h>
> +#include <linux/slab.h>
>
> #include <asm/delay.h>
> #include <sound/core.h>
> diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
> index 2053008..2935533 100644
> --- a/drivers/staging/tm6000/tm6000-cards.c
> +++ b/drivers/staging/tm6000/tm6000-cards.c
> @@ -24,6 +24,7 @@
> #include <linux/i2c.h>
> #include <linux/usb.h>
> #include <linux/version.h>
> +#include <linux/slab.h>
> #include <media/v4l2-common.h>
> #include <media/tuner.h>
> #include <media/tvaudio.h>
> diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
> index d9cade0..2ae7ae0 100644
> --- a/drivers/staging/tm6000/tm6000-core.c
> +++ b/drivers/staging/tm6000/tm6000-core.c
> @@ -22,6 +22,7 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> +#include <linux/slab.h>
> #include <linux/usb.h>
> #include <linux/i2c.h>
> #include "tm6000.h"
> diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
> index 1072206..dfba5e6 100644
> --- a/drivers/staging/tm6000/tm6000-dvb.c
> +++ b/drivers/staging/tm6000/tm6000-dvb.c
> @@ -18,6 +18,7 @@
> */
>
> #include <linux/kernel.h>
> +#include <linux/slab.h>
> #include <linux/usb.h>
>
> #include "tm6000.h"
> --
> 1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* [PATCH 05a/17] v4l-dvb: update gfp/slab.h includes
2010-04-03 1:36 ` Stephen Rothwell
@ 2010-04-03 1:43 ` Stephen Rothwell
2010-05-20 1:48 ` Stephen Rothwell
2010-04-05 2:27 ` [PATCH 05/17] staging: " Tejun Heo
1 sibling, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-04-03 1:43 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Tejun Heo, linux-next, linux-kernel, Greg Kroah-Hartman
From: Tejun Heo <tj@kernel.org>
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/staging/tm6000/tm6000-alsa.c | 1 +
drivers/staging/tm6000/tm6000-cards.c | 1 +
drivers/staging/tm6000/tm6000-core.c | 1 +
drivers/staging/tm6000/tm6000-dvb.c | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
Just the v4l-dvb split our part of what was the staging tree patch.
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index bc89f9d..3404516 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -15,6 +15,7 @@
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/usb.h>
+#include <linux/slab.h>
#include <asm/delay.h>
#include <sound/core.h>
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 2053008..2935533 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -24,6 +24,7 @@
#include <linux/i2c.h>
#include <linux/usb.h>
#include <linux/version.h>
+#include <linux/slab.h>
#include <media/v4l2-common.h>
#include <media/tuner.h>
#include <media/tvaudio.h>
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index d9cade0..2ae7ae0 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/i2c.h>
#include "tm6000.h"
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index 1072206..dfba5e6 100644
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -18,6 +18,7 @@
*/
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include "tm6000.h"
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 05/17] staging: update gfp/slab.h includes
2010-04-03 1:36 ` Stephen Rothwell
2010-04-03 1:43 ` [PATCH 05a/17] v4l-dvb: " Stephen Rothwell
@ 2010-04-05 2:27 ` Tejun Heo
1 sibling, 0 replies; 72+ messages in thread
From: Tejun Heo @ 2010-04-05 2:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, 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 <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
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCHSET linux-next] update gfp/slab.h includes
2010-03-29 17:52 [PATCHSET linux-next] update gfp/slab.h includes Tejun Heo
` (16 preceding siblings ...)
2010-03-29 17:52 ` [PATCH 17/17] arm: " Tejun Heo
@ 2010-04-06 2:30 ` Tejun Heo
17 siblings, 0 replies; 72+ messages in thread
From: Tejun Heo @ 2010-04-06 2:30 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel
Hello, Stephen.
On 03/30/2010 02:52 AM, Tejun Heo wrote:
> Mainline is scheduled to be updated not to include slab.h implicitly
> from percpu.h which means that each .c file which uses gfp or slab API
> should include respective header file directly.
You probably have noticed already but both slabh branch and percpu
changes have been merged to mainline, so once these patches are merged
to subsystem trees, there shouldn't be many new breakages showing up
in linux-next. Thanks a lot for helping testing and fixing up this
huge ugly monster. Much appreciated.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
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:50 ` Stephen Rothwell
1 sibling, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 9:02 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Tejun Heo, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 1691 bytes --]
Hi John,
On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: John W. Linville <linville@tuxdriver.com>
> ---
> drivers/net/wireless/ath/ath9k/htc.h | 1 +
> drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
> index 7770649..4497479 100644
> --- a/drivers/net/wireless/ath/ath9k/htc.h
> +++ b/drivers/net/wireless/ath/ath9k/htc.h
> @@ -23,6 +23,7 @@
> #include <linux/skbuff.h>
> #include <linux/netdevice.h>
> #include <linux/leds.h>
> +#include <linux/slab.h>
> #include <net/mac80211.h>
>
> #include "common.h"
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
> index 4c5395e..0cc7fd9 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
> @@ -30,6 +30,7 @@
> #include <linux/module.h>
> #include <linux/etherdevice.h>
> #include <linux/sched.h>
> +#include <linux/gfp.h>
> #include <net/mac80211.h>
>
> #include "iwl-dev.h"
I think that this patch is still needed in the wireless tree and I notice
that Dave has asked Linus to pull the net tree (containing the wireless
tree). I have been carrying this in linux-next.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
2010-05-19 9:02 ` Stephen Rothwell
@ 2010-05-19 14:45 ` John W. Linville
2010-05-19 15:28 ` Stephen Rothwell
0 siblings, 1 reply; 72+ messages in thread
From: John W. Linville @ 2010-05-19 14:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo, David S. Miller
On Wed, May 19, 2010 at 07:02:30PM +1000, Stephen Rothwell wrote:
> Hi John,
>
> On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <tj@kernel.org> wrote:
> >
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> >
> > Signed-off-by: Tejun Heo <tj@kernel.org>
> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > Cc: John W. Linville <linville@tuxdriver.com>
> I think that this patch is still needed in the wireless tree and I notice
> that Dave has asked Linus to pull the net tree (containing the wireless
> tree). I have been carrying this in linux-next.
Looks like this was part of a series...who merged the rest of it?
I guess I presumed they would take care of the series.
Tejun, I wouldn't mind a repost, preferrably Cc:
linux-wireless@vger.kernel.org...
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
2010-05-19 14:45 ` John W. Linville
@ 2010-05-19 15:28 ` Stephen Rothwell
2010-05-19 15:46 ` Tejun Heo
0 siblings, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:28 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Tejun Heo, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 654 bytes --]
Hi John,
On Wed, 19 May 2010 10:45:05 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> Looks like this was part of a series...who merged the rest of it?
> I guess I presumed they would take care of the series.
It was a series of patches that were only relevant to the trees in
linux-next (for a change that happened in Linus' tree). My hope (and I
assume Tejun's) was that each maintainer would take the patch relevant to
their tree (some did - I just checked I still have 10 of them being
applied to linux-next :-().
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 02/17] kdb: update gfp/slab.h includes
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
0 siblings, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:33 UTC (permalink / raw)
To: Jason Wessel; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Jason,
On Tue, 30 Mar 2010 02:52:30 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Jason Wessel <jason.wessel@windriver.com>
Please apply to the kgdb tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Jason Wessel <jason.wessel@windriver.com>
Subject: [PATCH 02/17] kdb: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:30 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jason Wessel <jason.wessel@windriver.com>
---
kernel/debug/kdb/kdb_main.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index bad8e63..ec29a9d 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -37,6 +37,7 @@
#include <linux/kdebug.h>
#include <linux/proc_fs.h>
#include <linux/uaccess.h>
+#include <linux/slab.h>
#include "kdb_private.h"
#define GREP_LEN 256
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 03/17] fsnotify: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 03/17] fsnotify: " Tejun Heo
@ 2010-05-19 15:36 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:36 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Eric,
On Tue, 30 Mar 2010 02:52:31 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the fsnotify tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Eric Paris <eparis@redhat.com>
Subject: [PATCH 03/17] fsnotify: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:31 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>
---
fs/notify/fanotify/fanotify_user.c | 1 +
fs/notify/vfsmount_mark.c | 1 -
3 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 7c869fa..c437bd4 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -10,6 +10,7 @@
#include <linux/poll.h>
#include <linux/security.h>
#include <linux/syscalls.h>
+#include <linux/slab.h>
#include <linux/types.h>
#include <linux/uaccess.h>
diff --git a/fs/notify/vfsmount_mark.c b/fs/notify/vfsmount_mark.c
index 8f1aa02..ec580a2 100644
--- a/fs/notify/vfsmount_mark.c
+++ b/fs/notify/vfsmount_mark.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/mount.h>
#include <linux/mutex.h>
-#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/writeback.h> /* for inode_lock */
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 04/17] ocfs2: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 04/17] ocfs2: " Tejun Heo
@ 2010-05-19 15:38 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:38 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Joel,
On Tue, 30 Mar 2010 02:52:32 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the ocfs2 tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Joel Becker <joel.becker@oracle.com>
Subject: [PATCH 04/17] ocfs2: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:32 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joel Becker <joel.becker@oracle.com>
---
fs/ocfs2/reservations.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c
index 7fc6cfe..ed59559 100644
--- a/fs/ocfs2/reservations.c
+++ b/fs/ocfs2/reservations.c
@@ -26,7 +26,6 @@
#include <linux/fs.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/bitops.h>
#include <linux/list.h>
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
2010-03-31 11:51 ` Gregory Haskins
@ 2010-05-19 15:42 ` Stephen Rothwell
-1 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:42 UTC (permalink / raw)
To: Gregory Haskins; +Cc: Tejun Heo, linux-kernel, linux-next
Hi Gregory,
On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <ghaskins@novell.com> wrote:
>
> >>> On 3/29/2010 at 01:52 PM, in message
> <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
> wrote:
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> >
> > Signed-off-by: Tejun Heo <tj@kernel.org>
> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > Cc: Gregory Haskins <ghaskins@novell.com>
>
> Thanks Tejun,
>
> Acked-by: Gregory Haskins <ghaskins@novell.com>
>
> (will add to my tree)
It never made it as far as I can see ... maybe something equivalent went in.
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Gregory Haskins <ghaskins@novell.com>
Subject: [PATCH 06/17] vbus: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:34 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gregory Haskins <ghaskins@novell.com>
---
drivers/vbus/pci-bridge.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
index 0d51324..36de7c4 100644
--- a/drivers/vbus/pci-bridge.c
+++ b/drivers/vbus/pci-bridge.c
@@ -22,6 +22,7 @@
#include <linux/pci.h>
#include <linux/mm.h>
#include <linux/workqueue.h>
+#include <linux/slab.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/ioq.h>
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
@ 2010-05-19 15:42 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:42 UTC (permalink / raw)
To: Gregory Haskins; +Cc: Tejun Heo, linux-kernel, linux-next
Hi Gregory,
On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <ghaskins@novell.com> wrote:
>
> >>> On 3/29/2010 at 01:52 PM, in message
> <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
> wrote:
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> >
> > Signed-off-by: Tejun Heo <tj@kernel.org>
> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > Cc: Gregory Haskins <ghaskins@novell.com>
>
> Thanks Tejun,
>
> Acked-by: Gregory Haskins <ghaskins@novell.com>
>
> (will add to my tree)
It never made it as far as I can see ... maybe something equivalent went in.
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Gregory Haskins <ghaskins@novell.com>
Subject: [PATCH 06/17] vbus: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:34 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gregory Haskins <ghaskins@novell.com>
---
drivers/vbus/pci-bridge.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
index 0d51324..36de7c4 100644
--- a/drivers/vbus/pci-bridge.c
+++ b/drivers/vbus/pci-bridge.c
@@ -22,6 +22,7 @@
#include <linux/pci.h>
#include <linux/mm.h>
#include <linux/workqueue.h>
+#include <linux/slab.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/ioq.h>
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 07/17] usb: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 07/17] usb: " Tejun Heo
@ 2010-05-19 15:44 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:44 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Greg,
On Tue, 30 Mar 2010 02:52:35 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the usb tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 07/17] usb: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:35 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/musb/musb_debugfs.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index b6a27ba..3310b52 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -34,7 +34,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/slab.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/kobject.h>
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 08/17] davinci: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 08/17] davinci: " Tejun Heo
@ 2010-05-19 15:45 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:45 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Kevin,
On Tue, 30 Mar 2010 02:52:36 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the davinci tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Kevin Hilman <khilman@deeprootsystems.com>
Subject: [PATCH 08/17] davinci: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:36 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---
drivers/rtc/rtc-davinci.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index 92a8f6c..34647fc 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -29,6 +29,7 @@
#include <linux/bcd.h>
#include <linux/platform_device.h>
#include <linux/io.h>
+#include <linux/slab.h>
/*
* The DaVinci RTC is a simple RTC with the following
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
2010-05-19 15:28 ` Stephen Rothwell
@ 2010-05-19 15:46 ` Tejun Heo
2010-05-19 16:31 ` Stephen Rothwell
0 siblings, 1 reply; 72+ messages in thread
From: Tejun Heo @ 2010-05-19 15:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, David S. Miller
Hello, John, Stephen.
On 05/19/2010 05:28 PM, Stephen Rothwell wrote:
>> Looks like this was part of a series...who merged the rest of it?
>> I guess I presumed they would take care of the series.
Most of the series have been applied circa 2.6.34-rc4. Stephen has
been carrying patches for branches which weren't yet in mainline.
IOW, these patches are necessary for a branch to be merged into
mainline.
> It was a series of patches that were only relevant to the trees in
> linux-next (for a change that happened in Linus' tree). My hope (and I
> assume Tejun's) was that each maintainer would take the patch relevant to
> their tree (some did - I just checked I still have 10 of them being
> applied to linux-next :-().
Yeap, I hoped that more of them would sort themselves out during devel
cycle, but I guess rc1 window isn't too bad.
Thank you.
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 10/17] wireless: " Tejun Heo
2010-05-19 9:02 ` Stephen Rothwell
@ 2010-05-19 15:50 ` Stephen Rothwell
1 sibling, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:50 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Tejun Heo, linux-wireless
Hi John,
On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the wireless tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, "John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH 10/17] wireless: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:38 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 7770649..4497479 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -23,6 +23,7 @@
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/leds.h>
+#include <linux/slab.h>
#include <net/mac80211.h>
#include "common.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
index 4c5395e..0cc7fd9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
@@ -30,6 +30,7 @@
#include <linux/module.h>
#include <linux/etherdevice.h>
#include <linux/sched.h>
+#include <linux/gfp.h>
#include <net/mac80211.h>
#include "iwl-dev.h"
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 02/17] kdb: update gfp/slab.h includes
2010-05-19 15:33 ` Stephen Rothwell
@ 2010-05-19 15:50 ` Jason Wessel
0 siblings, 0 replies; 72+ messages in thread
From: Jason Wessel @ 2010-05-19 15:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo
On 05/19/2010 10:33 AM, Stephen Rothwell wrote:
> Hi Jason,
>
> On Tue, 30 Mar 2010 02:52:30 +0900 Tejun Heo <tj@kernel.org> wrote:
>
>> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>> gfp.h or slab.h is included as necessary.
>>
>> Signed-off-by: Tejun Heo <tj@kernel.org>
>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> Cc: Jason Wessel <jason.wessel@windriver.com>
>>
>
> Please apply to the kgdb tree (patch reposted below).
>
>
No problem.
Looks like it got missed earlier, because I have a fixup from you for
the kdb_support.c file.
I folded this into kgdb-next.
Cheers,
Jason.
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 11/17] mtd: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 11/17] mtd: " Tejun Heo
@ 2010-05-19 15:51 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:51 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, linux-kernel, Tejun Heo
Hi David,
On Tue, 30 Mar 2010 02:52:39 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the mtd tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH 11/17] mtd: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:39 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Woodhouse <dwmw2@infradead.org>
---
drivers/mtd/mtdcore.c | 1 +
drivers/mtd/nand/mpc5121_nfc.c | 1 +
drivers/mtd/nand/r852.c | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index e8573c9..3c48193 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -18,6 +18,7 @@
#include <linux/proc_fs.h>
#include <linux/idr.h>
#include <linux/backing-dev.h>
+#include <linux/gfp.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index d7333f4..1a06f78 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -27,6 +27,7 @@
#include <linux/module.h>
#include <linux/clk.h>
+#include <linux/gfp.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 96bfbd8..dd5158c 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -15,6 +15,7 @@
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include <asm/byteorder.h>
#include <linux/sched.h>
#include "sm_common.h"
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 16/17] acpi: update gfp/slab.h includes
2010-03-29 17:52 ` [PATCH 16/17] acpi: " Tejun Heo
@ 2010-05-19 15:54 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:54 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Len,
On Tue, 30 Mar 2010 02:52:44 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply this to the acpi tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Len Brown <lenb@kernel.org>
Subject: [PATCH 16/17] acpi: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:44 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Len Brown <lenb@kernel.org>
---
drivers/acpi/apei/apei-base.c | 1 +
drivers/acpi/atomicio.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index c35fec7..2672880 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -34,6 +34,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/acpi.h>
+#include <linux/slab.h>
#include <linux/io.h>
#include <linux/kref.h>
#include <linux/rculist.h>
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
index 4ed1385..e21b1e4 100644
--- a/drivers/acpi/atomicio.c
+++ b/drivers/acpi/atomicio.c
@@ -31,6 +31,7 @@
#include <linux/kref.h>
#include <linux/rculist.h>
#include <linux/interrupt.h>
+#include <linux/slab.h>
#include <acpi/atomicio.h>
#define ACPI_PFX "ACPI: "
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 17/17] arm: update gfp/slab.h includes
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
0 siblings, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 15:56 UTC (permalink / raw)
To: Russell King; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Russell,
On Tue, 30 Mar 2010 02:52:45 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply to the arm tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Russell King <linux@arm.linux.org.uk>
Subject: [PATCH 17/17] arm: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:45 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Russell King <linux@arm.linux.org.uk>
---
arch/arm/mach-vexpress/ct-ca9x4.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 5a0449c..b4b0bb4 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -2,6 +2,7 @@
* Versatile Express Core Tile Cortex A9x4 Support
*/
#include <linux/init.h>
+#include <linux/gfp.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
2010-05-19 15:46 ` Tejun Heo
@ 2010-05-19 16:31 ` Stephen Rothwell
2010-05-19 16:47 ` Tejun Heo
0 siblings, 1 reply; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-19 16:31 UTC (permalink / raw)
To: Tejun Heo; +Cc: John W. Linville, linux-next, linux-kernel, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
Hi Tejun,
On Wed, 19 May 2010 17:46:17 +0200 Tejun Heo <tj@kernel.org> wrote:
>
> Yeap, I hoped that more of them would sort themselves out during devel
> cycle, but I guess rc1 window isn't too bad.
I have now reposted all the outstanding ones.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 10/17] wireless: update gfp/slab.h includes
2010-05-19 16:31 ` Stephen Rothwell
@ 2010-05-19 16:47 ` Tejun Heo
0 siblings, 0 replies; 72+ messages in thread
From: Tejun Heo @ 2010-05-19 16:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, David S. Miller
On 05/19/2010 06:31 PM, Stephen Rothwell wrote:
> Hi Tejun,
>
> On Wed, 19 May 2010 17:46:17 +0200 Tejun Heo <tj@kernel.org> wrote:
>>
>> Yeap, I hoped that more of them would sort themselves out during devel
>> cycle, but I guess rc1 window isn't too bad.
>
> I have now reposted all the outstanding ones.
Thanks for taking care of them. :-)
--
tejun
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
2010-05-19 15:42 ` Stephen Rothwell
@ 2010-05-19 16:56 ` Gregory Haskins
-1 siblings, 0 replies; 72+ messages in thread
From: Gregory Haskins @ 2010-05-19 16:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Tejun Heo, linux-kernel, linux-next
>>> On 5/19/2010 at 11:42 AM, in message
<20100520014225.e4343903.sfr@canb.auug.org.au>, Stephen Rothwell
<sfr@canb.auug.org.au> wrote:
> Hi Gregory,
>
> On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <ghaskins@novell.com>
> wrote:
>>
>> >>> On 3/29/2010 at 01:52 PM, in message
>> <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
>> wrote:
>> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>> > gfp.h or slab.h is included as necessary.
>> >
>> > Signed-off-by: Tejun Heo <tj@kernel.org>
>> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Cc: Gregory Haskins <ghaskins@novell.com>
>>
>> Thanks Tejun,
>>
>> Acked-by: Gregory Haskins <ghaskins@novell.com>
>>
>> (will add to my tree)
>
> It never made it as far as I can see ... maybe something equivalent went in.
Hi Steven,
I dropped the ball on this. Will merge when I return from lunch.
-Greg
>
> From: Tejun Heo <tj@kernel.org>
> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
> linux-kernel@vger.kernel.org
> Cc: Tejun Heo <tj@kernel.org>, Gregory Haskins <ghaskins@novell.com>
> Subject: [PATCH 06/17] vbus: update gfp/slab.h includes
> Date: Tue, 30 Mar 2010 02:52:34 +0900
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Gregory Haskins <ghaskins@novell.com>
> ---
> drivers/vbus/pci-bridge.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
> index 0d51324..36de7c4 100644
> --- a/drivers/vbus/pci-bridge.c
> +++ b/drivers/vbus/pci-bridge.c
> @@ -22,6 +22,7 @@
> #include <linux/pci.h>
> #include <linux/mm.h>
> #include <linux/workqueue.h>
> +#include <linux/slab.h>
> #include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/ioq.h
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
@ 2010-05-19 16:56 ` Gregory Haskins
0 siblings, 0 replies; 72+ messages in thread
From: Gregory Haskins @ 2010-05-19 16:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Tejun Heo, linux-kernel, linux-next
>>> On 5/19/2010 at 11:42 AM, in message
<20100520014225.e4343903.sfr@canb.auug.org.au>, Stephen Rothwell
<sfr@canb.auug.org.au> wrote:
> Hi Gregory,
>
> On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <ghaskins@novell.com>
> wrote:
>>
>> >>> On 3/29/2010 at 01:52 PM, in message
>> <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
>> wrote:
>> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>> > gfp.h or slab.h is included as necessary.
>> >
>> > Signed-off-by: Tejun Heo <tj@kernel.org>
>> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Cc: Gregory Haskins <ghaskins@novell.com>
>>
>> Thanks Tejun,
>>
>> Acked-by: Gregory Haskins <ghaskins@novell.com>
>>
>> (will add to my tree)
>
> It never made it as far as I can see ... maybe something equivalent went in.
Hi Steven,
I dropped the ball on this. Will merge when I return from lunch.
-Greg
>
> From: Tejun Heo <tj@kernel.org>
> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
> linux-kernel@vger.kernel.org
> Cc: Tejun Heo <tj@kernel.org>, Gregory Haskins <ghaskins@novell.com>
> Subject: [PATCH 06/17] vbus: update gfp/slab.h includes
> Date: Tue, 30 Mar 2010 02:52:34 +0900
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Gregory Haskins <ghaskins@novell.com>
> ---
> drivers/vbus/pci-bridge.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c
> index 0d51324..36de7c4 100644
> --- a/drivers/vbus/pci-bridge.c
> +++ b/drivers/vbus/pci-bridge.c
> @@ -22,6 +22,7 @@
> #include <linux/pci.h>
> #include <linux/mm.h>
> #include <linux/workqueue.h>
> +#include <linux/slab.h>
> #include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/ioq.h
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 17/17] arm: update gfp/slab.h includes
2010-05-19 15:56 ` Stephen Rothwell
@ 2010-05-19 17:56 ` Russell King - ARM Linux
0 siblings, 0 replies; 72+ messages in thread
From: Russell King - ARM Linux @ 2010-05-19 17:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo
On Thu, May 20, 2010 at 01:56:43AM +1000, Stephen Rothwell wrote:
> Hi Russell,
I'm afraid it's too late for the first round; I sent Linus the pull
request yesterday. However, I'll queue it in a few days as a fix.
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
2010-05-19 15:42 ` Stephen Rothwell
@ 2010-05-19 20:31 ` Gregory Haskins
-1 siblings, 0 replies; 72+ messages in thread
From: Gregory Haskins @ 2010-05-19 20:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Tejun Heo, linux-kernel, linux-next
>>> On 5/19/2010 at 12:56 PM, in message <4BF41843.61E : 90 : 47687>, Gregory
Haskins wrote:
> >>> On 5/19/2010 at 11:42 AM, in message
> <20100520014225.e4343903.sfr@canb.auug.org.au>, Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
>> Hi Gregory,
>>
>> On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <ghaskins@novell.com>
>> wrote:
>>>
>>> >>> On 3/29/2010 at 01:52 PM, in message
>>> <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
>>> wrote:
>>> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>>> > gfp.h or slab.h is included as necessary.
>>> >
>>> > Signed-off-by: Tejun Heo <tj@kernel.org>
>>> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>>> > Cc: Gregory Haskins <ghaskins@novell.com>
>>>
>>> Thanks Tejun,
>>>
>>> Acked-by: Gregory Haskins <ghaskins@novell.com>
>>>
>>> (will add to my tree)
>>
>> It never made it as far as I can see ... maybe something equivalent went in.
>
> Hi Steven,
>
> I dropped the ball on this. Will merge when I return from lunch.
>
> -Greg
Pushed (and sorry for the name mis-spelling above, Stephen!)
-Greg
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 06/17] vbus: update gfp/slab.h includes
@ 2010-05-19 20:31 ` Gregory Haskins
0 siblings, 0 replies; 72+ messages in thread
From: Gregory Haskins @ 2010-05-19 20:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Tejun Heo, linux-kernel, linux-next
>>> On 5/19/2010 at 12:56 PM, in message <4BF41843.61E : 90 : 47687>, Gregory
Haskins wrote:
> >>> On 5/19/2010 at 11:42 AM, in message
> <20100520014225.e4343903.sfr@canb.auug.org.au>, Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
>> Hi Gregory,
>>
>> On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <ghaskins@novell.com>
>> wrote:
>>>
>>> >>> On 3/29/2010 at 01:52 PM, in message
>>> <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org>
>>> wrote:
>>> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
>>> > gfp.h or slab.h is included as necessary.
>>> >
>>> > Signed-off-by: Tejun Heo <tj@kernel.org>
>>> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>>> > Cc: Gregory Haskins <ghaskins@novell.com>
>>>
>>> Thanks Tejun,
>>>
>>> Acked-by: Gregory Haskins <ghaskins@novell.com>
>>>
>>> (will add to my tree)
>>
>> It never made it as far as I can see ... maybe something equivalent went in.
>
> Hi Steven,
>
> I dropped the ball on this. Will merge when I return from lunch.
>
> -Greg
Pushed (and sorry for the name mis-spelling above, Stephen!)
-Greg
^ permalink raw reply [flat|nested] 72+ messages in thread
* Re: [PATCH 05a/17] v4l-dvb: update gfp/slab.h includes
2010-04-03 1:43 ` [PATCH 05a/17] v4l-dvb: " Stephen Rothwell
@ 2010-05-20 1:48 ` Stephen Rothwell
0 siblings, 0 replies; 72+ messages in thread
From: Stephen Rothwell @ 2010-05-20 1:48 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Tejun Heo, linux-next, linux-kernel, Greg Kroah-Hartman
Hi Mauro,
On Sat, 3 Apr 2010 12:43:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> From: Tejun Heo <tj@kernel.org>
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
Please apply this to the v4l-dvb tree (patch reposted below).
From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: [PATCH 05a/17] v4l-dvb: update gfp/slab.h includes
Date: Tue, 30 Mar 2010 02:52:33 +0900
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/staging/tm6000/tm6000-alsa.c | 1 +
drivers/staging/tm6000/tm6000-cards.c | 1 +
drivers/staging/tm6000/tm6000-core.c | 1 +
drivers/staging/tm6000/tm6000-dvb.c | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index bc89f9d..3404516 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -15,6 +15,7 @@
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/usb.h>
+#include <linux/slab.h>
#include <asm/delay.h>
#include <sound/core.h>
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 2053008..2935533 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -24,6 +24,7 @@
#include <linux/i2c.h>
#include <linux/usb.h>
#include <linux/version.h>
+#include <linux/slab.h>
#include <media/v4l2-common.h>
#include <media/tuner.h>
#include <media/tvaudio.h>
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index d9cade0..2ae7ae0 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/i2c.h>
#include "tm6000.h"
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index 1072206..dfba5e6 100644
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -18,6 +18,7 @@
*/
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include "tm6000.h"
--
1.6.4.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 72+ messages in thread
end of thread, other threads:[~2010-05-20 1:49 UTC | newest]
Thread overview: 72+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 05/17] staging: " Tejun Heo
2010-03-29 17:52 ` [PATCH 06/17] vbus: " Tejun Heo
2010-03-31 11:51 ` Gregory Haskins
2010-03-31 11:51 ` Gregory Haskins
2010-05-19 15:42 ` Stephen Rothwell
2010-05-19 15:42 ` Stephen Rothwell
2010-05-19 16:56 ` Gregory Haskins
2010-05-19 16:56 ` Gregory Haskins
2010-05-19 20:31 ` 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 6:56 ` Dmitry Torokhov
2010-03-30 8:23 ` Stephen Rothwell
2010-03-30 6:56 ` Dmitry Torokhov
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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.