From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756781Ab2IMIpm (ORCPT ); Thu, 13 Sep 2012 04:45:42 -0400 Received: from mga02.intel.com ([134.134.136.20]:28910 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752068Ab2IMIpj (ORCPT ); Thu, 13 Sep 2012 04:45:39 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,416,1344236400"; d="scan'208";a="192438219" Message-ID: <1347525987.1682.1194.camel@rui.sh.intel.com> Subject: Re: linux-next: build failure after merge of the akpm tree From: Zhang Rui To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Fengguang Wu , Amit Daniel Kachhap Date: Thu, 13 Sep 2012 16:46:27 +0800 In-Reply-To: <20120913174441.f5fbf5cc38713425331f4d86@canb.auug.org.au> References: <20120913174441.f5fbf5cc38713425331f4d86@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2 (3.2.2-1.fc16) Content-Transfer-Encoding: 8bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, all, On 四, 2012-09-13 at 17:44 +1000, Stephen Rothwell wrote: > 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 thanks for the fix. I'm new as a git owner, so a stupid question here, in this case, who should keep this fix? Do I need to do something when sending pull request? thanks, rui > --- > 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 >