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

From	Mark Brown <broonie@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the regulator tree with the qcom tree
Date	2015-12-17 19:10 +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>
Organization	linux.* mail to news gateway

Show all headers | 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