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]

Date:   Tue, 30 May 2023 11:28:13 +0200
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>,
        "Andrew Davis" <afd@...com>,
        "Bartosz Golaszewski" <bartosz.golaszewski@...aro.org>,
        "Linus Walleij" <linus.walleij@...aro.org>,
        "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
        linux-next <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree

On Tue, May 30, 2023, at 06:19, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/gpio/gpio-twl4030.c
>
> between commit:
>
>   d5f4fa60d63a ("ARM/gpio: Push OMAP2 quirk down into TWL4030 driver")
>
> from the arm-soc tree and commit:
>
>   fbc8ab2ccd85 ("gpio: twl4030: Use devm_gpiochip_add_data() to 
> simplify remove path")
>
> from the gpio-brgl tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Maybe Bartosz wants to merge Linus' gpio-omap-descriptors-v6.5 series
into the gpio/for-next branch as well? It touches both the
arch/arm/mach-omap and a lot of the drivers using the gpios, so we
could treat this as a shared immutable branch.

    Arnd