linux-kernel - Re: linux-next: manual merge of the gpio-brgl 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <a124f713-8cbb-46d3-850c-1dd1b9010258@app.fastmail.com>
Date: Thu, 12 Sep 2024 12:10:38 +0000
From: "Arnd Bergmann" <arnd@...db.de>
To: "Stephen Rothwell" <sfr@...b.auug.org.au>,
 "Bartosz Golaszewski" <brgl@...ev.pl>, "Olof Johansson" <olof@...om.net>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>,
 "Andy Shevchenko" <andriy.shevchenko@...ux.intel.com>,
 "Bartosz Golaszewski" <bartosz.golaszewski@...aro.org>,
 "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
 linux-next <linux-next@...r.kernel.org>,
 "Nikita Shubin" <nikita.shubin@...uefel.me>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree

On Thu, Sep 12, 2024, at 07:48, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   arch/arm/mach-ep93xx/vision_ep9307.c
>
> between commit:
>
>   3e0bae7f35c9 ("ARM: ep93xx: delete all boardfiles")
>
> from the arm-soc tree and commits:
>
>   4b2b0a2ce815 ("gpiolib: legacy: Kill GPIOF_INIT_* definitions")
>   8c045ca534d0 ("gpiolib: legacy: Kill GPIOF_DIR_* definitions")
>
> from the gpio-brgl tree.
>
> I fixed it up (I removed the file)

Looks good, thanks,

     Arnd