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

[Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>]

On Mon, Dec 12, 2022 at 5:16 AM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
>
> What has however conflicted in linux-next is pinctrl and the SoC tree, see:
> https://lore.kernel.org/linux-next/20221206121336.474457bb@xxxxxxxxxxxxxxxx/
> 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