From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Zhang Rui <rui.zhang@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Amit Daniel Kachhap <amit.kachhap@linaro.org>,
Fengguang Wu <fengguang.wu@intel.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: build failure after merge of the thermal tree
Date: Mon, 8 Oct 2012 11:02:05 +1100 [thread overview]
Message-ID: <20121008110205.1e0abbe228186fcf30afad74@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]
Hi Zhang,
After merging the thermal 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 023614183768 ("thermal: add generic cpufreq cooling
implementation") interacting with commit 125c4c706b68 ("idr: rename
MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.
I have applied the following fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 10:56:56 +1100
Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/thermal/cpu_cooling.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 9050c1b..cc1c930 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-10-08 0:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-08 0:02 Stephen Rothwell [this message]
2012-10-08 2:14 ` linux-next: build failure after merge of the thermal tree Zhang, Rui
2012-10-09 2:11 ` Fengguang Wu
2014-10-10 1:14 Stephen Rothwell
2014-10-10 8:19 ` Zhang Rui
2014-10-16 1:53 Stephen Rothwell
2014-12-09 2:17 Stephen Rothwell
2014-12-09 2:31 ` Aaron Lu
2014-12-09 2:32 ` Zhang Rui
2018-06-08 0:51 Stephen Rothwell
2018-06-08 1:07 ` Stephen Rothwell
2018-12-07 1:24 Stephen Rothwell
2018-12-07 6:57 ` Amit Kucheria
2019-12-11 22:50 Stephen Rothwell
2019-12-12 22:14 ` Stephen Rothwell
2019-12-13 1:03 ` Daniel Lezcano
2019-12-20 0:04 ` Stephen Rothwell
2019-12-20 8:25 ` Daniel Lezcano
2020-03-03 6:07 Stephen Rothwell
2020-03-03 7:55 ` Daniel Lezcano
2020-03-03 7:57 ` Anson Huang
2020-03-23 0:08 Stephen Rothwell
2020-03-23 6:59 ` Zhang Rui
2020-12-15 1:58 Stephen Rothwell
2022-08-01 22:35 broonie
2022-08-02 15:04 ` Mark Brown
2022-08-02 15:19 ` Daniel Lezcano
2022-08-03 13:05 broonie
2022-08-03 13:24 ` Daniel Lezcano
2023-01-04 23:46 Stephen Rothwell
2023-01-05 9:38 ` Daniel Lezcano
2023-01-16 0:08 Stephen Rothwell
2023-01-24 23:02 Stephen Rothwell
2023-12-18 23:34 Stephen Rothwell
2023-12-19 2:10 ` Fabio Estevam
2023-12-19 17:59 ` Daniel Lezcano
2023-12-21 1:17 ` Stephen Rothwell
2023-12-21 15:23 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121008110205.1e0abbe228186fcf30afad74@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=amit.kachhap@linaro.org \
--cc=fengguang.wu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).