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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20151217175822.GA3835@Agamemnon.attlocal.net>
Date:	Thu, 17 Dec 2015 11:58:22 -0600
From:	Andy Gross <andy.gross@...aro.org>
To:	Mark Brown <broonie@...nel.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Liam Girdwood <lgirdwood@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Gross <agross@...eaurora.org>
Subject: Re: linux-next: manual merge of the regulator tree with the qcom tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/