Re: linux-next: manual merge of the pinctrl tree with the net-next tree
From: Drew Fustini
Date: Thu Nov 07 2024 - 21:37:58 EST
On Thu, Nov 07, 2024 at 02:59:25PM +0100, Linus Walleij wrote:
> On Thu, Nov 7, 2024 at 11:43 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > Today's linux-next merge of the pinctrl tree got a conflict in:
> >
> > MAINTAINERS
>
> Thanks Stephen, looks trivial enough but will try to remember to mention
> this to Torvalds.
>
> Yours,
> Linus Walleij
Thank you for handling this conflict.
Drew