linux-kernel - Re: [GIT PULL] regulator and spi updates for v5.7

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: <CAHk-=wiS7BSueNOs=GZ0Eic-3jfpBHbt9Bm5Rk0BYVFRVLyTEQ@mail.gmail.com>
Date:   Mon, 30 Mar 2020 15:02:56 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Mark Brown <broonie@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        linux-spi@...r.kernel.org, Liam Girdwood <lgirdwood@...il.com>
Subject: Re: [GIT PULL] regulator and spi updates for v5.7

On Mon, Mar 30, 2020 at 5:37 AM Mark Brown <broonie@...nel.org> wrote:
>
> At one point in the release cycle I managed to fat finger things and
> apply some SPI fixes onto a regulator branch and merge that into the
> SPI tree, then pull in a change shared with the MTD tree moving the
> Mediatek quadspi driver over to become the Mediatek spi-nor driver in
> the SPI tree.
>
> This has made a mess which I only just noticed while preparing this
> and I can't see a sensible way to unpick things due to other
> subsequent merge commits especially the pull from MTD so it looks like
> the most sensible thing to do is give up and combine the two pull
> requests.
>
> I hope this is OK. Sorry about this, I've changed some bits of
> workflow which should hopefully help me spot such issues earlier in
> future.

No problem - and thanks for the explanation. These things happen,

          Linus