On Fri, Aug 18, 2023 at 1:26 PM Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote: > > 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. > > The resolution LGTM. Thanks! The conflict is local to the pinctrl tree now, Torvalds will fix this conflict when I send my pull request for v6.6 to him. Yours, Linus Walleij
