Hi Andrew, After merging the akpm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/thermal/cpu_cooling.c: In function 'get_idr': drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared (first use in this function) Caused by commit "idr: rename MAX_LEVEL to MAX_IDR_LEVEL" from the akpm tree interacting with commit 78edc7cdcf5e ("thermal: add generic cpufreq cooling implementation") from the thermal tree. I have applied the following merge fix patch and can carry it as necessary. From: Stephen Rothwell Date: Thu, 13 Sep 2012 17:42:11 +1000 Subject: [PATCH] thermal: fix up for MAX_ID_MASK rename Signed-off-by: Stephen Rothwell --- drivers/thermal/cpu_cooling.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 99a5d75..f6ce617 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -9,7 +9,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. * - * This program is distributed in the hope that it will be useful, but + * This program is distributed in the hope that it will be useful, butX_ID_MASK * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. @@ -86,7 +86,7 @@ again: else if (unlikely(err)) return err; - *id = *id & MAX_ID_MASK; + *id = *id & MAX_IDR_MASK; return 0; } -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au