update gfp/slab.h includes
Subsystems (31)
PATCH 1/1 update gfp/slab.h includes
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
PATCH 1/17 sound: update gfp/slab.h includes
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- 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(-)
sound/soc/codecs/cq93vc.c +1 -0
@@ -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>
sound/soc/davinci/davinci-vcif.c +1 -0
@@ -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>
sound/usb/caiaq/input.c +1 -0
@@ -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>
sound/usb/urb.c +1 -0
@@ -15,6 +15,7 @@* */ +#include <linux/gfp.h> #include <linux/init.h> #include <linux/usb.h> #include <linux/usb/audio.h>
Signature · 1 line
1.6.4.2
Takashi Iwai
AppliedRe: [PATCH 01/17] sound: update gfp/slab.h includes
At Tue, 30 Mar 2010 02:52:29 +0900,
Quoted 7 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Takashi Iwai <[email protected]>
Thanks, applied now to sound git tree.
Takashi
Quoted 58 lines
--- 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(-)sound/soc/codecs/cq93vc.c +1
-0@@ -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> sound/soc/davinci/davinci-vcif.c +1
-0@@ -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> sound/usb/caiaq/input.c +1
-0@@ -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> sound/usb/urb.c +1
-0@@ -15,6 +15,7 @@* */ +#include <linux/gfp.h> #include <linux/init.h> #include <linux/usb.h> #include <linux/usb/audio.h> Signature · 1 line
1.6.4.2
PATCH 2/17 kdb: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- kernel/debug/kdb/kdb_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/debug/kdb/kdb_main.c +1 -0
@@ -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
Signature · 1 line
1.6.4.2
Re: [PATCH 02/17] kdb: update gfp/slab.h includes
Hi Jason,
Quoted 7 lines · On Tue, 30 Mar 2010 02:52:30 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Jason Wessel <[email protected]>
Please apply to the kgdb tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Jason Wessel <[email protected]>
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.
--- kernel/debug/kdb/kdb_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/debug/kdb/kdb_main.c +1 -0
@@ -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
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Jason Wessel
maintainerRe: [PATCH 02/17] kdb: update gfp/slab.h includes
Quoted 7 lines · Stephen Rothwell
Hi Jason,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:30 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Jason Wessel <[email protected]>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.
PATCH 3/17 fsnotify: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- 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(-)
fs/notify/fanotify/fanotify_user.c +1 -0
@@ -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>
fs/notify/mark.c +0 -1
@@ -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 */
fs/notify/vfsmount_mark.c +0 -1
@@ -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 */
Signature · 1 line
1.6.4.2
Re: [PATCH 03/17] fsnotify: update gfp/slab.h includes
Hi Eric,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:31 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the fsnotify tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Eric Paris <[email protected]>
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.
--- fs/notify/fanotify/fanotify_user.c | 1 + fs/notify/vfsmount_mark.c | 1 - 3 files changed, 1 insertions(+), 2 deletions(-)
fs/notify/fanotify/fanotify_user.c +1 -0
@@ -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>
fs/notify/vfsmount_mark.c +0 -1
@@ -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 */
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 4/17 ocfs2: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- fs/ocfs2/reservations.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
fs/ocfs2/reservations.c +0 -1
@@ -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>
Signature · 1 line
1.6.4.2
Re: [PATCH 04/17] ocfs2: update gfp/slab.h includes
Hi Joel,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:32 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the ocfs2 tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Joel Becker <[email protected]>
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.
--- fs/ocfs2/reservations.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
fs/ocfs2/reservations.c +0 -1
@@ -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>
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 5/17 staging: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- 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(-)
drivers/staging/comedi/drivers/quatech_daqp_cs.c +1 -0
@@ -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>
drivers/staging/otus/usbdrv.h +1 -0
@@ -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"
drivers/staging/tm6000/tm6000-alsa.c +1 -0
@@ -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>
drivers/staging/tm6000/tm6000-cards.c +1 -0
@@ -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>
drivers/staging/tm6000/tm6000-core.c +1 -0
@@ -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"
drivers/staging/tm6000/tm6000-dvb.c +1 -0
@@ -18,6 +18,7 @@*/ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/usb.h> #include "tm6000.h"
Signature · 1 line
1.6.4.2
Re: [PATCH 05/17] staging: update gfp/slab.h includes
Hi Tejun,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:33 +0900 Tejun Heo <[email protected]> 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.
Quoted 4 lines
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 <[email protected]> (cc'd).
Quoted 76 lines
6 files changed, 6 insertions(+), 0 deletions(-)drivers/staging/comedi/drivers/quatech_daqp_cs.c +1
-0@@ -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> drivers/staging/otus/usbdrv.h +1
-0@@ -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" drivers/staging/tm6000/tm6000-alsa.c +1
-0@@ -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> drivers/staging/tm6000/tm6000-cards.c +1
-0@@ -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> drivers/staging/tm6000/tm6000-core.c +1
-0@@ -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" drivers/staging/tm6000/tm6000-dvb.c +1
-0@@ -18,6 +18,7 @@*/ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/usb.h> #include "tm6000.h" Signature · 1 line
1.6.4.2
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/1 v4l-dvb: update gfp/slab.h includes
From: Tejun Heo <[email protected]>
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- 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.
drivers/staging/tm6000/tm6000-alsa.c +1 -0
@@ -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>
drivers/staging/tm6000/tm6000-cards.c +1 -0
@@ -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>
drivers/staging/tm6000/tm6000-core.c +1 -0
@@ -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"
drivers/staging/tm6000/tm6000-dvb.c +1 -0
@@ -18,6 +18,7 @@*/ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/usb.h> #include "tm6000.h"
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 05a/17] v4l-dvb: update gfp/slab.h includes
Hi Mauro,
Quoted 5 lines · On Sat, 3 Apr 2010 12:43:31 +1100 Stephen Rothwell <[email protected]> wrote:
From: Tejun Heo <[email protected]>
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply this to the v4l-dvb tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Mauro Carvalho Chehab <[email protected]>
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.
--- 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(-)
drivers/staging/tm6000/tm6000-alsa.c +1 -0
@@ -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>
drivers/staging/tm6000/tm6000-cards.c +1 -0
@@ -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>
drivers/staging/tm6000/tm6000-core.c +1 -0
@@ -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"
drivers/staging/tm6000/tm6000-dvb.c +1 -0
@@ -18,6 +18,7 @@*/ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/usb.h> #include "tm6000.h"
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 05/17] staging: update gfp/slab.h includes
In reply to Stephen RothwellHello,
Quoted 7 lines · Stephen Rothwell
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:33 +0900 Tejun Heo <[email protected]> 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.
Signature · 1 line
tejun
PATCH 6/17 vbus: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/vbus/pci-bridge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/vbus/pci-bridge.c +1 -0
@@ -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>
Signature · 1 line
1.6.4.2
Re: [PATCH 06/17] vbus: update gfp/slab.h includes
Quoted 1 line
Quoted 1 line
Quoted 1 line
On 3/29/2010 at 01:52 PM, in message
<[email protected]>, Tejun Heo <[email protected]>
Quoted 6 lines · wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Gregory Haskins <[email protected]>
Thanks Tejun,
(will add to my tree)
Quoted 16 lines
--- drivers/vbus/pci-bridge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/vbus/pci-bridge.c +1
-0@@ -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
Re: [PATCH 06/17] vbus: update gfp/slab.h includes
Hi Gregory,
Quoted 11 lines · On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <[email protected]>…
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
On 3/29/2010 at 01:52 PM, in message
<[email protected]>, Tejun Heo <[email protected]>
Quoted 6 lines · wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Gregory Haskins <[email protected]>
Quoted 5 lines
Thanks Tejun,
Acked-by Gregory Haskins <[email protected]>(will add to my tree)
It never made it as far as I can see ... maybe something equivalent went in.
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Gregory Haskins <[email protected]>
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.
--- drivers/vbus/pci-bridge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/vbus/pci-bridge.c +1 -0
@@ -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>
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 06/17] vbus: update gfp/slab.h includes
Quoted 1 line
Quoted 1 line
Quoted 1 line
On 5/19/2010 at 11:42 AM, in message
<[email protected]>, Stephen Rothwell
Quoted 15 lines · <[email protected]> wrote:
Hi Gregory,
Quoted 11 lines · On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <[email protected]>…
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
On 3/29/2010 at 01:52 PM, in message
<[email protected]>, Tejun Heo <[email protected]>
Quoted 6 lines · wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Gregory Haskins <[email protected]>
Quoted 7 lines
Quoted 5 lines
Thanks Tejun,
Acked-by Gregory Haskins <[email protected]>(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
Quoted 30 lines
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Gregory Haskins <[email protected]>
Subject: [PATCH 06/17] vbus: updategfp/slab.hincludes
Date: Tue, 30 Mar 2010 02:52:34 +0900Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Gregory Haskins <[email protected]>--- drivers/vbus/pci-bridge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/vbus/pci-bridge.c +1
-0@@ -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
Re: [PATCH 06/17] vbus: update gfp/slab.h includes
In reply to Stephen RothwellQuoted 1 line
Quoted 1 line
Quoted 1 line
On 5/19/2010 at 12:56 PM, in message <4BF41843.61E : 90 : 47687>, Gregory
Quoted 24 lines · Haskins
Quoted 1 line
Quoted 1 line
Quoted 1 line
On 5/19/2010 at 11:42 AM, in message
<[email protected]>, Stephen Rothwell
Quoted 21 lines · <[email protected]> wrote:
Hi Gregory,
Quoted 16 lines · On Wed, 31 Mar 2010 05:51:28 -0600 "Gregory Haskins" <[email protected]>…
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
On 3/29/2010 at 01:52 PM, in message
<[email protected]>, Tejun Heo <[email protected]>
Quoted 6 lines · wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Gregory Haskins <[email protected]>Thanks Tejun,
Acked-by Gregory Haskins <[email protected]>(will add to my tree)
Quoted 7 lines
Quoted 1 line
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
PATCH 7/17 usb: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/usb/musb/musb_debugfs.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/usb/musb/musb_debugfs.c +0 -1
@@ -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>
Signature · 1 line
1.6.4.2
Re: [PATCH 07/17] usb: update gfp/slab.h includes
Hi Greg,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:35 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the usb tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Greg Kroah-Hartman <[email protected]>
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.
--- drivers/usb/musb/musb_debugfs.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/usb/musb/musb_debugfs.c +0 -1
@@ -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>
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 8/17 davinci: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/rtc/rtc-davinci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/rtc/rtc-davinci.c +1 -0
@@ -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
Signature · 1 line
1.6.4.2
Re: [PATCH 08/17] davinci: update gfp/slab.h includes
Hi Kevin,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:36 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the davinci tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Kevin Hilman <[email protected]>
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.
--- drivers/rtc/rtc-davinci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/rtc/rtc-davinci.c +1 -0
@@ -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
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 9/17 pcmcia: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- 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(-)
drivers/isdn/hardware/avm/avm_cs.c +0 -1
@@ -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>
drivers/pcmcia/pcmcia_cis.c +1 -0
@@ -14,6 +14,7 @@* */ +#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/netdevice.h>
drivers/pcmcia/rsrc_iodyn.c +1 -0
@@ -12,6 +12,7 @@* (C) 1999 David A. Hinds */ +#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h>
Signature · 1 line
1.6.4.2
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
Quoted 6 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dominik Brodowski <[email protected]>
Quoted 45 lines
--- 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(-)drivers/isdn/hardware/avm/avm_cs.c +0
-1@@ -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> drivers/pcmcia/pcmcia_cis.c +1
-0@@ -14,6 +14,7 @@* */ +#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/netdevice.h> drivers/pcmcia/rsrc_iodyn.c +1
-0@@ -12,6 +12,7 @@* (C) 1999 David A. Hinds */ +#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> Signature · 1 line
1.6.4.2
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
Hi Dominik,
Quoted 9 lines · On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski…
Quoted 6 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dominik Brodowski <[email protected]>
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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
Hello,
Quoted 7 lines · Stephen Rothwell
Hi Dominik,
Quoted 5 lines · On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski…
Quoted 3 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dominik Brodowski <[email protected]>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.
Signature · 1 line
tejun
Dominik Brodowski
maintainerRe: [PATCH 09/17] pcmcia: update gfp/slab.h includes
Quoted 17 lines · Tejun Heo
Hello,
Quoted 14 lines · Stephen Rothwell
Hi Dominik,
Quoted 9 lines · On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski…
Quoted 6 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dominik Brodowski <[email protected]>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.
Quoted 2 lines
Stephen's patches on
drivers/input/misc/ad714x.candpcf8574_keypad.cinto input tree.
That's nothing I can do anything about -- Dmitry?
Best,
Dominik
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
Quoted 19 lines · Dominik Brodowski
Quoted 17 lines · Tejun Heo
Hello,
Quoted 14 lines · Stephen Rothwell
Hi Dominik,
Quoted 9 lines · On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski…
Quoted 6 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dominik Brodowski <[email protected]>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.
Quoted 7 lines
Okay, applied it.
Quoted 2 lines
Stephen's patches on
drivers/input/misc/ad714x.candpcf8574_keypad.cinto 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.
Signature · 1 line
Dmitry
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
Hi Dmitry,
Quoted 3 lines · On Mon, 29 Mar 2010 23:56:05 -0700 Dmitry Torokhov <[email protected]>…
Yes, I will roll teh relevant parts into respective patches if you don't mind.
Great, thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
In reply to Dominik BrodowskiQuoted 19 lines · Dominik Brodowski
Quoted 17 lines · Tejun Heo
Hello,
Quoted 14 lines · Stephen Rothwell
Hi Dominik,
Quoted 9 lines · On Mon, 29 Mar 2010 21:32:03 +0200 Dominik Brodowski…
Quoted 6 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dominik Brodowski <[email protected]>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.
Quoted 7 lines
Okay, applied it.
Quoted 2 lines
Stephen's patches on
drivers/input/misc/ad714x.candpcf8574_keypad.cinto 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.
Signature · 1 line
Dmitry
Re: [PATCH 09/17] pcmcia: update gfp/slab.h includes
In reply to Dominik BrodowskiHi Dominik,
Quoted 2 lines · On Tue, 30 Mar 2010 08:36:09 +0200 Dominik Brodowski…
Okay, applied it.
Great, thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 10/17 wireless: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/net/wireless/ath/ath9k/htc.h | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/htc.h +1 -0
@@ -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"
drivers/net/wireless/iwlwifi/iwl-agn-ict.c +1 -0
@@ -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"
Signature · 1 line
1.6.4.2
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
Hi John,
Quoted 29 lines · On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc John W. Linville <[email protected]>--- drivers/net/wireless/ath/ath9k/htc.h | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)drivers/net/wireless/ath/ath9k/htc.h +1
-0@@ -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" drivers/net/wireless/iwlwifi/iwl-agn-ict.c +0
-0
drivers/net/wireless/iwlwifi/iwl-agn-ict.c line 36
Quoted 7 lines
drivers/net/wireless/iwlwifi/iwl-agn-ict.c +1
-0@@ -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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
Quoted 7 lines · Stephen Rothwell
Hi John,
Quoted 4 lines · On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Quoted 7 lines
Quoted 3 lines
Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc John W. Linville <[email protected]>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:
[email protected]...
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
Hi John,
Quoted 3 lines · On Wed, 19 May 2010 10:45:05 -0400 "John W. Linville" <[email protected]>…
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 :-().
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
Hello, John, Stephen.
Quoted 2 lines · Stephen Rothwell
Quoted 2 lines
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.
Quoted 5 lines
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.
Signature · 1 line
tejun
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
Hi Tejun,
Quoted 3 lines · On Wed, 19 May 2010 17:46:17 +0200 Tejun Heo <[email protected]> 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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
Quoted 8 lines · Stephen Rothwell
Hi Tejun,
Quoted 3 lines · On Wed, 19 May 2010 17:46:17 +0200 Tejun Heo <[email protected]> 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. :-)
Signature · 1 line
tejun
Re: [PATCH 10/17] wireless: update gfp/slab.h includes
In reply to Tejun HeoHi John,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the wireless tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, "John W. Linville" <[email protected]>
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.
--- drivers/net/wireless/ath/ath9k/htc.h | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/htc.h +1 -0
@@ -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"
drivers/net/wireless/iwlwifi/iwl-agn-ict.c +1 -0
@@ -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"
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 11/17 mtd: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- 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(-)
drivers/mtd/mtdcore.c +1 -0
@@ -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"
drivers/mtd/nand/mpc5121_nfc.c +1 -0
@@ -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>
drivers/mtd/nand/r852.c +1 -0
@@ -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"
Signature · 1 line
1.6.4.2
Re: [PATCH 11/17] mtd: update gfp/slab.h includes
Hi David,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:39 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the mtd tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, David Woodhouse <[email protected]>
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.
--- 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(-)
drivers/mtd/mtdcore.c +1 -0
@@ -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>
drivers/mtd/nand/mpc5121_nfc.c +1 -0
@@ -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>
drivers/mtd/nand/r852.c +1 -0
@@ -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"
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 12/17 mfd: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/gpio/rdc321x-gpio.c | 1 + drivers/mfd/davinci_voicecodec.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpio/rdc321x-gpio.c +1 -0
@@ -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;
drivers/mfd/davinci_voicecodec.c +1 -0
@@ -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>
Signature · 1 line
1.6.4.2
Re: [PATCH 12/17] mfd: update gfp/slab.h includes
Hi Tejun,
Quoted 2 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his 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:
to this patch.
Cheers,
Samuel.
Quoted 35 lines
Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Samuel Ortiz <[email protected]>--- drivers/gpio/rdc321x-gpio.c | 1 + drivers/mfd/davinci_voicecodec.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)drivers/gpio/rdc321x-gpio.c +1
-0@@ -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;drivers/mfd/davinci_voicecodec.c +1
-0@@ -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> Signature · 1 line
1.6.4.2
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Re: [PATCH 12/17] mfd: update gfp/slab.h includes
Quoted 11 lines · Samuel Ortiz
Hi Tejun,
Quoted 2 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his 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 <[email protected]>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.
Re: [PATCH 12/17] mfd: update gfp/slab.h includes
Quoted 11 lines · Mark Brown
Quoted 9 lines · Samuel Ortiz
Hi Tejun,
Quoted 2 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his 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 <[email protected]>
Quoted 5 lines
Quoted 1 line
to this patch.
Unfortunately
drivers/gpio/rdc321x-gpio.cisn'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.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Re: [PATCH 12/17] mfd: update gfp/slab.h includes
Hi Samuel, Mark,
Quoted 13 lines · On Fri, 2 Apr 2010 18:25:47 +0200 Samuel Ortiz <[email protected]> wrote:
Quoted 11 lines · Mark Brown
Quoted 9 lines · Samuel Ortiz
Hi Tejun,
Quoted 2 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his 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 <[email protected]>
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
to this patch.
Unfortunately
drivers/gpio/rdc321x-gpio.cisn'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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 13/17 hid: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/hid/hid-roccat-kone.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/hid/hid-roccat-kone.c +1 -0
@@ -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"
Signature · 1 line
1.6.4.2
Re: [PATCH 13/17] hid: update gfp/slab.h includes
Quoted 15 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Jiri Kosina <[email protected]>--- drivers/hid/hid-roccat-kone.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/hid/hid-roccat-kone.c +0
-0
drivers/hid/hid-roccat-kone.c line 40
Quoted 6 lines
drivers/hid/hid-roccat-kone.c +1
-0@@ -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,
Signature · 2 lines
Jiri Kosina SUSE Labs, Novell Inc.
Re: [PATCH 13/17] hid: update gfp/slab.h includes
Quoted 2 lines · Jiri Kosina
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. :-)
Signature · 1 line
tejun
PATCH 14/17 input: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/char/sysrq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/char/sysrq.c +1 -1
@@ -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>
Signature · 1 line
1.6.4.2
Re: [PATCH 14/17] input: update gfp/slab.h includes
Hi Tejun,
Quoted 16 lines · On Tue, 30 Mar 2010 02:52:42 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo <[email protected]>Cc Stephen Rothwell <[email protected]>Cc Dmitry Torokhov <[email protected]>--- drivers/char/sysrq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/char/sysrq.c +0
-0
drivers/char/sysrq.c line 47
Quoted 8 lines
drivers/char/sysrq.c +1
-1@@ -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).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 14/17] input: update gfp/slab.h includes
Hello,
Quoted 11 lines · Stephen Rothwell
Quoted 11 lines
drivers/char/sysrq.c +1
-1@@ -41,7 +41,7 @@#include <linux/hrtimer.h> #include <linux/oom.h> #include <linux/input.h> -#include <linux/gfp.h> +#include <linux/slab.h>
Quoted 6 lines
drivers/char/sysrq.c line 47
Quoted 2 lines
drivers/char/sysrq.c +0
-0#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.
Signature · 1 line
tejun
Re: [PATCH 14/17] input: update gfp/slab.h includes
Hello, again.
Quoted 3 lines · Tejun Heo
Ah, I see. sysrq.c's requirement changed between mainline and linux-next. I'll update slabh tree such that it includes
slab.hfrom 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.
Signature · 1 line
tejun
Re: [PATCH 14/17] input: update gfp/slab.h includes
Hi Tejun,
Quoted 6 lines · On Tue, 30 Mar 2010 22:29:19 +0900 Tejun Heo <[email protected]> wrote:
slabh updated such that...
* kmemcheck fix patch is placed before the patch to break implicit
slab.hinclusion.
Quoted 8 lines
*
sysrq.cnow includesslab.hinstead ofgfp.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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 15/17 libata: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/ata/ahci_platform.c | 1 + drivers/ata/libahci.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/ata/ahci_platform.c +1 -0
@@ -13,6 +13,7 @@*/ #include <linux/kernel.h> +#include <linux/gfp.h> #include <linux/module.h> #include <linux/init.h> #include <linux/interrupt.h>
drivers/ata/libahci.c +1 -0
@@ -33,6 +33,7 @@*/ #include <linux/kernel.h> +#include <linux/gfp.h> #include <linux/module.h> #include <linux/init.h> #include <linux/blkdev.h>
Signature · 1 line
1.6.4.2
Re: [PATCH 15/17] libata: update gfp/slab.h includes
Quoted 10 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo<[email protected]>Cc Stephen Rothwell<[email protected]>Cc Jeff Garzik<[email protected]>--- 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...
Re: [PATCH 15/17] libata: update gfp/slab.h includes
Quoted 5 lines · Jeff Garzik
Quoted 2 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Unless you object, I'll go ahead and apply this to #upstream...
Yes, please.
Thank you.
Signature · 1 line
tejun
Jeff Garzik
AppliedRe: [PATCH 15/17] libata: update gfp/slab.h includes
In reply to Tejun HeoQuoted 10 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo<[email protected]>Cc Stephen Rothwell<[email protected]>Cc Jeff Garzik<[email protected]>--- drivers/ata/ahci_platform.c | 1 + drivers/ata/libahci.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
applied
Re: [PATCH 15/17] libata: update gfp/slab.h includes
Hi Jeff,
Quoted 13 lines · On Tue, 30 Mar 2010 13:02:51 -0400 Jeff Garzik <[email protected]> wrote:
Quoted 10 lines · Tejun Heo
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.Signed-off-by Tejun Heo<[email protected]>Cc Stephen Rothwell<[email protected]>Cc Jeff Garzik<[email protected]>--- drivers/ata/ahci_platform.c | 1 + drivers/ata/libahci.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
Quoted 1 line
applied
Thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 16/17 acpi: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- drivers/acpi/apei/apei-base.c | 1 + drivers/acpi/atomicio.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/acpi/apei/apei-base.c +1 -0
@@ -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>
drivers/acpi/atomicio.c +1 -0
@@ -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: "
Signature · 1 line
1.6.4.2
Re: [PATCH 16/17] acpi: update gfp/slab.h includes
Hi Len,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:44 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply this to the acpi tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Len Brown <[email protected]>
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.
--- drivers/acpi/apei/apei-base.c | 1 + drivers/acpi/atomicio.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/acpi/apei/apei-base.c +1 -0
@@ -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>
drivers/acpi/atomicio.c +1 -0
@@ -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: "
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 17/17 arm: update gfp/slab.h includes
In reply to Tejun HeoImplicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary.
--- arch/arm/mach-vexpress/ct-ca9x4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-vexpress/ct-ca9x4.c +1 -0
@@ -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>
Signature · 1 line
1.6.4.2
Re: [PATCH 17/17] arm: update gfp/slab.h includes
Hi Russell,
Quoted 3 lines · On Tue, 30 Mar 2010 02:52:45 +0900 Tejun Heo <[email protected]> wrote:
Implicit
slab.hinclusion viapercpu.his about to go away. Make suregfp.horslab.his included as necessary.
Please apply to the arm tree (patch reposted below).
From: Tejun Heo <[email protected]>
To: [email protected], [email protected],
[email protected]
Cc: Tejun Heo <[email protected]>, Russell King <[email protected]>
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.
--- arch/arm/mach-vexpress/ct-ca9x4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-vexpress/ct-ca9x4.c +1 -0
@@ -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>
Signature · 6 lines
1.6.4.2 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: [PATCH 17/17] arm: update gfp/slab.h includes
Quoted 1 line · Stephen Rothwell
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.
Hello, Stephen.
Quoted 3 lines · Tejun Heo
Mainline is scheduled to be updated not to include
slab.himplicitly frompercpu.hwhich 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.
Signature · 1 line
tejun