From: "Arnd Bergmann" <arnd@arndb•de>
To: "Stephen Rothwell" <sfr@canb•auug.org.au>,
"Linus Walleij" <linus.walleij@linaro•org>,
"Olof Johansson" <olof@lixom•net>
Cc: ARM <linux-arm-kernel@lists•infradead.org>,
"Alexander Sverdlin" <alexander.sverdlin@gmail•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
linux-next <linux-next@vger•kernel.org>,
"Nikita Shubin" <nikita.shubin@maquefel•me>,
"Théo Lebrun" <theo.lebrun@bootlin•com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree
Date: Thu, 12 Sep 2024 12:10:03 +0000 [thread overview]
Message-ID: <c2247944-8917-4bfe-8689-22a43861997d@app.fastmail.com> (raw)
In-Reply-To: <20240912175501.02f057f1@canb.auug.org.au>
On Thu, Sep 12, 2024, at 07:55, Stephen Rothwell wrote:
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@@ -22,8 -22,8 +22,9 @@@ obj-$(CONFIG_PINCTRL_CY8C95X0) += pinct
> obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o
> obj-$(CONFIG_PINCTRL_DA9062) += pinctrl-da9062.o
> obj-$(CONFIG_PINCTRL_DIGICOLOR) += pinctrl-digicolor.o
> - obj-$(CONFIG_PINCTRL_EQUILIBRIUM) += pinctrl-equilibrium.o
> +obj-$(CONFIG_PINCTRL_EP93XX) += pinctrl-ep93xx.o
> + obj-$(CONFIG_PINCTRL_EQUILIBRIUM) += pinctrl-equilibrium.o
> + obj-$(CONFIG_PINCTRL_EYEQ5) += pinctrl-eyeq5.o
> obj-$(CONFIG_PINCTRL_GEMINI) += pinctrl-gemini.o
> obj-$(CONFIG_PINCTRL_INGENIC) += pinctrl-ingenic.o
> obj-$(CONFIG_PINCTRL_K210) += pinctrl-k210.o
Looks good, I did the same merge when testing this.
Thanks,
Arnd
next prev parent reply other threads:[~2024-09-12 12:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 7:55 linux-next: manual merge of the pinctrl tree with the arm-soc tree Stephen Rothwell
2024-09-12 12:10 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 1:13 Stephen Rothwell
2022-12-06 15:04 ` Andy Shevchenko
2022-11-18 5:06 Stephen Rothwell
2021-12-17 6:29 Stephen Rothwell
2021-12-17 8:02 ` Arnd Bergmann
2021-12-17 11:02 ` Andy Shevchenko
2017-01-31 5:29 Stephen Rothwell
2014-11-10 6:34 Stephen Rothwell
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=c2247944-8917-4bfe-8689-22a43861997d@app.fastmail.com \
--to=arnd@arndb$(echo .)de \
--cc=alexander.sverdlin@gmail$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nikita.shubin@maquefel$(echo .)me \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=theo.lebrun@bootlin$(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