linux-kernel - Re: linux-next: manual merge of the pinctrl tree with the gpio 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] [day] [month] [year] [list]

Message-ID: <CACRpkdbfe+az-Cgymd0Y+-m1MqvdSNb-H1XO0923cQ7RwEWanA@mail.gmail.com>
Date:   Mon, 26 Aug 2019 13:16:42 +0200
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Stefan Wahren <wahrenst@....net>
Subject: Re: linux-next: manual merge of the pinctrl tree with the gpio tree

On Mon, Aug 26, 2019 at 1:03 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the pinctrl tree got a conflict in:
>
>   drivers/pinctrl/bcm/pinctrl-bcm2835.c
>
> between commit:
>
>   82357f82ec69 ("pinctrl: bcm2835: Pass irqchip when adding gpiochip")
>
> from the gpio tree and commit:
>
>   e38a9a437fb9 ("pinctrl: bcm2835: Add support for BCM2711 pull-up functionality")
>
> from the pinctrl tree.

Ah that's so unnecessary. I will take the patch out of the GPIO
tree and put it into the pinctrl tree instead, thanks for noticing!

Yours,
Linus Walleij