Subject: Re: linux-next: manual merge of the gpio-brgl tree with the usb tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 2 Nov 2023 11:29:50 +1100

Hi all,

On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <[email-masked]> wrote:
> 
> 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.

This is now a conflict between the usb tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell