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]

Date:	Thu, 17 Dec 2015 11:22:01 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	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 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?

Download attachment "signature.asc" of type "application/pgp-signature" (474 bytes)