Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i56a14606:Fastmail
User-Agent: Cyrus-JMAP/3.9.0-alpha0-441-ga3ab13cd6d-fm-20230517.001-ga3ab13cd
Mime-Version: 1.0
Message-Id: <e6217d79-0e80-4478-a8f9-c52ce0f65377@app.fastmail.com>
In-Reply-To: <20230530141914.672a8e59@canb.auug.org.au>
References: <20230530141914.672a8e59@canb.auug.org.au>
Date:   Tue, 30 May 2023 11:28:13 +0200
From:   "Arnd Bergmann" <arnd@arndb.de>
To:     "Stephen Rothwell" <sfr@canb.auug.org.au>,
        "Bartosz Golaszewski" <brgl@bgdev.pl>,
        "Olof Johansson" <olof@lixom.net>
Cc:     ARM <linux-arm-kernel@lists.infradead.org>,
        "Andrew Davis" <afd@ti.com>,
        "Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>,
        "Linus Walleij" <linus.walleij@linaro.org>,
        "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
        linux-next <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree
Content-Type: text/plain
Precedence: bulk

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