linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20151217130129.7ba3b7ae@canb.auug.org.au>
Date:	Thu, 17 Dec 2015 13:01:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nel.org>,
	Liam Girdwood <lgirdwood@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Gross <agross@...eaurora.org>
Subject: linux-next: manual merge of the regulator tree with the qcom tree

Hi all,

Today's linux-next merge of the regulator tree got a conflict in:

  Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt

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).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/