linux-kernel - Re: [GIT PULL] pin control bulk changes for v6.2

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <CAHk-=wiK9DDH-sE7V1t_QF89nc=uEMt9mhL=LFR1a3R2AK=_ng@mail.gmail.com>
Date:   Tue, 13 Dec 2022 13:09:03 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Linus Walleij <linus.walleij@...aro.org>
Cc:     linux-kernel <linux-kernel@...r.kernel.org>,
        "open list:GPIO SUBSYSTEM" <linux-gpio@...r.kernel.org>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>
Subject: Re: [GIT PULL] pin control bulk changes for v6.2

On Mon, Dec 12, 2022 at 5:16 AM Linus Walleij <linus.walleij@...aro.org> wrote:
>
> What has however conflicted in linux-next is pinctrl and the SoC tree, see:
> https://lore.kernel.org/linux-next/20221206121336.474457bb@canb.auug.org.au/
> this was caused by a merge path misunderstanding, so now it becomes
> your problem, congratulations.

Heh. That's the spirit! It's the season of giving, after all.

> However as you can see the resolution is fairly trivial and available in linux-next.

Yeah, not a problem, this was a very normal conflict.

                  Linus