wireless: update gfp/slab.h includes
in [Kernel]
|
Prev: [PATCH 3/8] USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()
Next: [PATCH 0/8] Several improvements to USB gadgets
From: Stephen Rothwell on 19 May 2010 05:10 Hi John, On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <tj(a)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(a)kernel.org> > Cc: Stephen Rothwell <sfr(a)canb.auug.org.au> > Cc: John W. Linville <linville(a)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(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: John W. Linville on 19 May 2010 11:10 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(a)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(a)kernel.org> > > Cc: Stephen Rothwell <sfr(a)canb.auug.org.au> > > Cc: John W. Linville <linville(a)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(a)vger.kernel.org... John -- John W. Linville Someday the world will need a hero, and you linville(a)tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 19 May 2010 11:30 Hi John, On Wed, 19 May 2010 10:45:05 -0400 "John W. Linville" <linville(a)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(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Tejun Heo on 19 May 2010 11:50 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 19 May 2010 12:00
Hi John, On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <tj(a)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(a)kernel.org> To: sfr(a)canb.auug.org.au, linux-next(a)vger.kernel.org, linux-kernel(a)vger.kernel.org Cc: Tejun Heo <tj(a)kernel.org>, "John W. Linville" <linville(a)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(a)kernel.org> Cc: Stephen Rothwell <sfr(a)canb.auug.org.au> Cc: John W. Linville <linville(a)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(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |