From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Geert Uytterhoeven <geert@linux-m68k•org>,
Linus Walleij <linus.walleij@linaro•org>
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>,
Geert Uytterhoeven <geert+renesas@glider•be>,
Lad Prabhakar <prabhakar.mahadev-lad.rj@bp•renesas.com>,
Thierry Bultel <thierry.bultel.yh@bp•renesas.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree
Date: Wed, 20 Aug 2025 13:02:27 +1000 [thread overview]
Message-ID: <20250820130227.5661da82@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]
Hi all,
After merging the pinctrl-renesas tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/pinctrl/renesas/pinctrl-rzt2h.c:161:14: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
161 | func = pinmux_generic_get_function(pctldev, func_selector);
| ^
Caused by commit
90f2896d7dbb ("pinctrl: renesas: Add support for RZ/T2H")
interacting with commit
afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")
from the pinctrl tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 20 Aug 2025 12:42:30 +1000
Subject: [PATCH] fix up for "pinctrl: renesas: Add support for RZ/T2H"
interacting with commit
afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")
from the pinctrl tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/pinctrl/renesas/pinctrl-rzt2h.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/renesas/pinctrl-rzt2h.c b/drivers/pinctrl/renesas/pinctrl-rzt2h.c
index a070fc447d96..3872638f5ebb 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzt2h.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzt2h.c
@@ -151,7 +151,7 @@ static int rzt2h_pinctrl_set_mux(struct pinctrl_dev *pctldev,
unsigned int group_selector)
{
struct rzt2h_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
- struct function_desc *func;
+ const struct function_desc *func;
struct group_desc *group;
const unsigned int *pins;
unsigned int i;
--
2.50.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-08-20 3:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-20 3:02 Stephen Rothwell [this message]
2025-08-20 7:02 ` linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2023-08-18 6:08 Stephen Rothwell
2023-08-18 11:26 ` Geert Uytterhoeven
2023-08-21 10:44 ` Linus Walleij
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=20250820130227.5661da82@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bartosz.golaszewski@linaro$(echo .)org \
--cc=geert+renesas@glider$(echo .)be \
--cc=geert@linux-m68k$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=prabhakar.mahadev-lad.rj@bp$(echo .)renesas.com \
--cc=thierry.bultel.yh@bp$(echo .)renesas.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