linux-kernel - Re: linux-next: manual merge of the pinctrl tree with the irqchip 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <CACRpkdYNnrk35yA5u8wxMyOquxSovr9xTeYjDd61K=38Vyby4g@mail.gmail.com>
Date:   Tue, 17 Aug 2021 22:14:35 +0200
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Marc Zyngier <maz@...nel.org>, Jianqun Xu <jay.xu@...k-chips.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl tree with the irqchip tree

On Tue, Aug 17, 2021 at 12:04 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the pinctrl tree got a conflict in:
>
>   drivers/pinctrl/pinctrl-rockchip.c
>
> between commit:
>
>   a9cb09b7be84 ("pinctrl: Bulk conversion to generic_handle_domain_irq()")
>
> from the irqchip tree and commit:
>
>   9ce9a02039de ("pinctrl/rockchip: drop the gpio related codes")
>
> from the pinctrl tree.
>
> I fixed it up (the latter removed the code changed by the former, so I
> did that) and can carry the fix as necessary.

I have created an immutable branch for these changes:
https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-rockchip

If it helps irqchip they can pull this in (and fix things on top if
need be).

Yours,
Linus Walleij