From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Gross <agross@codeaurora.org>
Subject: linux-next: manual merge of the regulator tree with the qcom tree
Date: Thu, 17 Dec 2015 13:01:29 +1100 [thread overview]
Message-ID: <20151217130129.7ba3b7ae@canb.auug.org.au> (raw)
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@canb.auug.org.au
next reply other threads:[~2015-12-17 2:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 2:01 Stephen Rothwell [this message]
2015-12-17 11:22 ` linux-next: manual merge of the regulator tree with the qcom tree Mark Brown
2015-12-17 17:58 ` Andy Gross
2015-12-17 18:03 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151217130129.7ba3b7ae@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agross@codeaurora.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox