Prev: [PATCH 2/2] ring-buffer: Add missing unlock
Next: Good day,
From: Stephen Rothwell on 29 Mar 2010 23:30
Hi Tejun,

On Tue, 30 Mar 2010 02:52:42 +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: Dmitry Torokhov <dmitry.torokhov(a)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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Tejun Heo on 30 Mar 2010 08:20
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
--
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: Tejun Heo on 30 Mar 2010 09:30
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
--
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 30 Mar 2010 09:50
Hi Tejun,

On Tue, 30 Mar 2010 22:29:19 +0900 Tejun Heo <htejun(a)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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
 | 
Pages: 1
Prev: [PATCH 2/2] ring-buffer: Add missing unlock
Next: Good day,