linux-kernel - Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACRpkdYu5WVQPpz5GE4cqjLJS_bpi-r++FeAw7CKovqvWd0knw@mail.gmail.com>
Date:   Mon, 21 Aug 2023 12:44:43 +0200
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Biju Das <biju.das.jz@...renesas.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>
Subject: Re: 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@...ux-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