linux-kernel - Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <c2247944-8917-4bfe-8689-22a43861997d@app.fastmail.com>
Date: Thu, 12 Sep 2024 12:10:03 +0000
From: "Arnd Bergmann" <arnd@...db.de>
To: "Stephen Rothwell" <sfr@...b.auug.org.au>,
 "Linus Walleij" <linus.walleij@...aro.org>, "Olof Johansson" <olof@...om.net>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>,
 "Alexander Sverdlin" <alexander.sverdlin@...il.com>,
 "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
 linux-next <linux-next@...r.kernel.org>,
 "Nikita Shubin" <nikita.shubin@...uefel.me>,
 Théo Lebrun <theo.lebrun@...tlin.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree

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