linux-kernel - Re: [GIT PULL] pin control bulk changes for the v4.11 kernel cycle

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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 21 Feb 2017 11:31:47 +0100
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Marek Szyprowski <m.szyprowski@...sung.com>,
        "linux-gpio@...r.kernel.org" <linux-gpio@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] pin control bulk changes for the v4.11 kernel cycle

On Tue, Feb 21, 2017 at 10:05 AM, Linus Walleij
<linus.walleij@...aro.org> wrote:

Damned I missed this too:

> - We merge an immutable branch from the GPIO tree that hits a whole slew
>   of sites in drivers/gpio, and obviously these changes will also be visible
>   in the GPIO pull request.

- The above leads to a conflict with the staging tree greybus GPIO
  driver in drivers/staging/greybus/gpio.c where a checkpatch fix was
  clashing with the changes.
  Stephen has a resolution in the next tree.

This is more of a minor, ordinary merge conflict (than the other crap in the
GPIO tree I try to solve right now) so should be OK for you to handle
I hope.

Yours,
Linus Walleij