linux-kernel - Re: linux-next: manual merge of the gpio-brgl 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]

Date:   Sat, 17 Aug 2019 00:30:50 +0200
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@...ev.pl>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Thierry Reding <treding@...dia.com>,
        Brian Masney <masneyb@...tation.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the gpio tree

On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   include/linux/gpio/driver.h
>
> between commit:
>
>   fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains")
>
> from the gpio tree and commit:
>
>   9091373ab7ea ("gpio: remove less important #ifdef around declarations")
>
> from the gpio-brgl tree.

OK Bartosz can you send me a pull request for your tree so we can
sync them up?

Yours,
Linus Walleij