Re: linux-next: manual merge of the regulator tree with the qcom tree

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Mark Brown <broonie@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the regulator tree with the qcom tree
Date	Thu, 17 Dec 2015 19:10:02 +0100
Message-ID	<qGLa2-2TY-11@gated-at.bofh.it> (permalink)
References	<qGwb0-1vx-13@gated-at.bofh.it> <qGEUW-79i-7@gated-at.bofh.it> <qGL0o-2Bm-47@gated-at.bofh.it>
X-Original-To	Andy Gross <andy.gross@linaro.org>
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cUlGATvL9lcudEbI"
Content-Disposition	inline
X-Cookie	revolutionary, adj.:
User-Agent	Mutt/1.5.24 (2015-08-30)
X-Sa-Exim-Connect-IP	94.175.94.161
X-Sa-Exim-Mail-From	broonie@sirena.org.uk
X-Sa-Exim-Version	4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000)
X-Sa-Exim-Scanned	Yes (on mezzanine.sirena.org.uk)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	39
Organization	linux.* mail to news gateway
X-Original-Cc	Stephen Rothwell <sfr@canb.auug.org.au>, Liam Girdwood <lgirdwood@gmail.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Gross <agross@codeaurora.org>
X-Original-Date	Thu, 17 Dec 2015 18:03:22 +0000
X-Original-Message-ID	<20151217180322.GT5727@sirena.org.uk>
X-Original-References	<20151217130129.7ba3b7ae@canb.auug.org.au> <20151217112201.GR5727@sirena.org.uk> <20151217175822.GA3835@Agamemnon.attlocal.net>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1294107

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

On Thu, Dec 17, 2015 at 11:58:22AM -0600, Andy Gross wrote:
> On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote:

> > > I fixed it up (I used the qcom tree version - please sort out the
> > > mess).

> > Andy, what's going on here?

> I hadn't reformulated my next branch before Stephen pulled again.  My
> mistake and it was fixed last night, but not in time.

OK, great - thanks.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the regulator tree with the qcom tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-17 03:10 +0100
  Re: linux-next: manual merge of the regulator tree with the qcom tree Mark Brown <broonie@kernel.org> - 2015-12-17 12:30 +0100
    Re: linux-next: manual merge of the regulator tree with the qcom tree Andy Gross <andy.gross@linaro.org> - 2015-12-17 19:00 +0100
      Re: linux-next: manual merge of the regulator tree with the qcom tree Mark Brown <broonie@kernel.org> - 2015-12-17 19:10 +0100

csiph-web