linux-next: build failure after merge of the final tree (akpm tree related)

Hi all,

After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:

kernel/cgroup_task_counter.c: In function 'task_counter_create':
kernel/cgroup_task_counter.c:60:3: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration]
kernel/cgroup_task_counter.c:60:3: warning: return makes pointer from integer without a cast [enabled by default]

Caused by commit 7d8662e11b18 ("cgroups: add a task counter subsystem")
from the akpm tree.

I added the following patch for today:

From: Stephen Rothwell <redacted>
Date: Wed, 5 Oct 2011 19:20:15 +1100
Subject: [PATCH] cgroups: ERR_PTR needs err.h

Signed-off-by: Stephen Rothwell <redacted>
---
 kernel/cgroup_task_counter.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/cgroup_task_counter.c b/kernel/cgroup_task_counter.c
index 2374905..201d8e3 100644
--- a/kernel/cgroup_task_counter.c
+++ b/kernel/cgroup_task_counter.c

@@ -11,6 +11,7 @@
 #include <linux/cgroup.h>
 #include <linux/slab.h>
 #include <linux/res_counter.h>
+#include <linux/err.h>
 
 
 struct task_counter {

-- 
1.7.6.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/