On Thu, Nov 02, 2023 at 11:29:50AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
Thanks, I'll note this in my pull request to Linus.
greg k-h
