From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Zhang Rui <rui.zhang@intel•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kees Cook <keescook@chromium•org>,
Bjorn Andersson <bjorn.andersson@linaro•org>,
Eduardo Valentin <edubezval@gmail•com>
Subject: linux-next: build failure after merge of the thermal tree
Date: Fri, 8 Jun 2018 10:51:20 +1000 [thread overview]
Message-ID: <20180608105120.2e232f44@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]
Hi Zhang,
After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/thermal/qcom/tsens.c: In function 'tsens_probe':
drivers/thermal/qcom/tsens.c:144:31: error: 's' undeclared (first use in this function)
num_sensors * sizeof(*s), GFP_KERNEL);
^
Caused by commit
6d7c70d1cd65 ("thermal: qcom: tsens: Allow number of sensors to come from DT")
interacting with commit
0ed2dd03b94b ("treewide: Use struct_size() for devm_kmalloc() and friends")
from Linus' tree. It looks like git somehow screwed up the automatic
conflict resolution.
I have added the following patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 8 Jun 2018 10:46:46 +1000
Subject: [PATCH] thermal: gcom: fix up bad git conflict resolution
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/thermal/qcom/tsens.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index fb8c87f55240..6164fd36dda3 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -140,8 +140,8 @@ static int tsens_probe(struct platform_device *pdev)
return -EINVAL;
}
- tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
- num_sensors * sizeof(*s), GFP_KERNEL);
+ tmdev = devm_kzalloc(dev, struct_size(tmdev, sensor, num_sensors),
+ GFP_KERNEL);
if (!tmdev)
return -ENOMEM;
--
2.17.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-06-08 0:51 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 0:51 Stephen Rothwell [this message]
2018-06-08 1:07 ` linux-next: build failure after merge of the thermal tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-05-27 12:56 Mark Brown
2026-05-27 19:50 ` Ronald Claveau
2026-05-29 14:57 ` Mark Brown
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
2023-01-24 23:02 Stephen Rothwell
2023-01-16 0:08 Stephen Rothwell
2023-01-04 23:46 Stephen Rothwell
2023-01-05 9:38 ` Daniel Lezcano
2022-08-03 13:05 broonie
2022-08-03 13:24 ` Daniel Lezcano
2022-08-01 22:35 broonie
2022-08-02 15:04 ` Mark Brown
2022-08-02 15:19 ` Daniel Lezcano
2020-12-15 1:58 Stephen Rothwell
2020-03-23 0:08 Stephen Rothwell
2020-03-23 6:59 ` Zhang Rui
2020-03-03 6:07 Stephen Rothwell
2020-03-03 7:55 ` Daniel Lezcano
2020-03-03 7:57 ` Anson Huang
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
2018-12-07 1:24 Stephen Rothwell
2018-12-07 6:57 ` Amit Kucheria
2014-12-09 2:17 Stephen Rothwell
2014-12-09 2:31 ` Aaron Lu
2014-12-09 2:32 ` Zhang Rui
2014-10-16 1:53 Stephen Rothwell
2014-10-10 1:14 Stephen Rothwell
2014-10-10 8:19 ` Zhang Rui
2012-10-08 0:02 Stephen Rothwell
2012-10-08 2:14 ` Zhang, Rui
2012-10-09 2:11 ` Fengguang Wu
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=20180608105120.2e232f44@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=edubezval@gmail$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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