Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
MIME-Version: 1.0
References: <20231016134159.11d8f849@canb.auug.org.au>
In-Reply-To: <20231016134159.11d8f849@canb.auug.org.au>
From:   Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Date:   Mon, 16 Oct 2023 08:46:28 +0200
Message-ID: <CACMJSesS-faA0VLTbX-8szNQCkYCX2WvzyW93jb3P_ttzULCLw@mail.gmail.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the usb tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@bgdev.pl>, Greg KH <greg@kroah.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        =?UTF-8?Q?Uwe_Kleine=2DK=C3=B6nig?= 
        <u.kleine-koenig@pengutronix.de>, Wentong Wu <wentong.wu@intel.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, 16 Oct 2023 at 04:42, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/gpio/gpio-ljca.c
>
> between commit:
>
>   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
>
> from the usb tree and commit:
>
>   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
>
> from the gpio-brgl tree.
>
> I fixed it up (I just used the former version) 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.
>
> --
> Cheers,
> Stephen Rothwell

Looks good, the latter patch converts the driver to using the
auxiliary bus whose .remove() already returns void.

Bart