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 [email protected]
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?
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.
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.