From: Andy Gross <andy.gross@linaro.org>
To: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
mahesh sivasubramanian <msivasub@codeaurora.org>,
ARM-SoC Maintainers <arm@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux ARM Mailing List <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL] Qualcomm Fixes for v4.18-rc2
Date: Wed, 27 Jun 2018 09:33:45 -0500 [thread overview]
Message-ID: <20180627143345.GA1141@hector.attlocal.net> (raw)
In-Reply-To: <CAOesGMjm-bO6C3wT1QpysYciAU+XuRcpEZFRMxrSnQnTFE04pw@mail.gmail.com>
On Tue, Jun 26, 2018 at 01:14:28PM -0700, Olof Johansson wrote:
> On Tue, Jun 26, 2018 at 10:42 AM, Olof Johansson <olof@lixom.net> wrote:
> > On Tue, Jun 26, 2018 at 02:08:13AM -0500, Andy Gross wrote:
> >> The following changes since commit 9573ce74d3bc797758cbd55194aae1b7248f2503:
> >>
> >> Merge tag 'qcom-fixes-for-4.18-rc1' into linus (2018-06-25 23:53:28 -0500)
>
> Hmm, I just noticed this. It is the kind of thing Linus sometimes gets
> upset about when it gets excessive (merge-backs).
>
> You should just have based this second branch on top of the first one
> without that merge. Or was it needed due to some conflict?
No this was an honest mistake on my part. There wasn't any need to merge in the
-rc1 as a base. My apologies.
Regards,
Andy
prev parent reply other threads:[~2018-06-27 14:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 7:08 [GIT PULL] Qualcomm Fixes for v4.18-rc2 Andy Gross
2018-06-26 17:42 ` Olof Johansson
2018-06-26 20:14 ` Olof Johansson
2018-06-27 14:33 ` Andy Gross [this message]
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=20180627143345.GA1141@hector.attlocal.net \
--to=andy.gross@linaro.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=msivasub@codeaurora.org \
--cc=olof@lixom.net \
--cc=torvalds@linux-foundation.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