From: Linus Torvalds <torvalds@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-spi@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: [GIT PULL] regulator and spi updates for v5.7
Date: Mon, 30 Mar 2020 15:02:56 -0700 [thread overview]
Message-ID: <CAHk-=wiS7BSueNOs=GZ0Eic-3jfpBHbt9Bm5Rk0BYVFRVLyTEQ@mail.gmail.com> (raw)
In-Reply-To: <20200330123732.GH4792@sirena.org.uk>
On Mon, Mar 30, 2020 at 5:37 AM Mark Brown <broonie@kernel.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
next prev parent reply other threads:[~2020-03-30 22:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 12:37 [GIT PULL] regulator and spi updates for v5.7 Mark Brown
2020-03-30 22:02 ` Linus Torvalds [this message]
2020-03-30 22:05 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHk-=wiS7BSueNOs=GZ0Eic-3jfpBHbt9Bm5Rk0BYVFRVLyTEQ@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).