Date: Thu, 17 Dec 2015 11:58:22 -0600
From: Andy Gross <andy.gross@linaro.org>
To: Mark Brown <broonie@kernel.org>
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>
Subject: Re: linux-next: manual merge of the regulator tree with the qcom tree
Message-ID: <20151217175822.GA3835@Agamemnon.attlocal.net>
References: <20151217130129.7ba3b7ae@canb.auug.org.au>
 <20151217112201.GR5727@sirena.org.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20151217112201.GR5727@sirena.org.uk>
User-Agent: Mutt/1.5.23.1 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 926
Lines: 27

On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote:
> On Thu, Dec 17, 2015 at 01:01:29PM +1100, Stephen Rothwell wrote:
> 
> > between commit:
> 
> >   f6251e80956d ("soc: qcom: documentation: Update SMD/RPM Docs")
> >   9ee8373a1552 ("soc: qcom: smd-rpm: Add existing platform support")
> 
> > from the qcom tree and commit:
> 
> >   7a400585893e ("soc: qcom: documentation: Update SMD/RPM Docs")
> 
> > from the regulator tree.
> 
> > 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.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/