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

[Linus Torvalds]

On Mon, Mar 30, 2020 at 5:37 AM Mark Brown <broonie@xxxxxxxxxx> 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