From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andy Gross <andy.gross@linaro.org>
Subject: Re: [GIT PULL] Qualcomm Fixes for v4.18-rc2
Date: Wed, 27 Jun 2018 09:33:45 -0500
Message-ID: <20180627143345.GA1141@hector.attlocal.net>
References: <1529996893-6390-1-git-send-email-andy.gross@linaro.org>
 <20180626174242.tksnyhhvqwglnz3o@localhost>
 <CAOesGMjm-bO6C3wT1QpysYciAU+XuRcpEZFRMxrSnQnTFE04pw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org>
Content-Disposition: inline
In-Reply-To: <CAOesGMjm-bO6C3wT1QpysYciAU+XuRcpEZFRMxrSnQnTFE04pw@mail.gmail.com>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
 <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
 <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.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>
List-Id: linux-arm-msm@vger.kernel.org

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