lkml.org 
[lkml]   [2023]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree
On Fri, Aug 18, 2023 at 1:26 PM Geert Uytterhoeven <geert@linux-m68k.org> 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

\
 
 \ /
  Last update: 2023-08-21 12:45    [W:0.066 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site