From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: Danila Tikhonov <danila@jiaxyga.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the usb tree with the regulator tree
Date: Tue, 20 Feb 2024 14:31:42 +1100 [thread overview]
Message-ID: <20240220143142.540fe132@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
between commit:
ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
from the regulator tree and commit:
ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add support for PMI632")
from the usb tree.
I fixed it up (I have no idea if this is correct - see below) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
index bf6336850be6,66dcd5ce03e6..000000000000
--- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
@@@ -24,7 -24,7 +24,8 @@@ properties
- qcom,pm8150b-vbus-reg
- items:
- enum:
+ - qcom,pm6150-vbus-reg
+ - qcom,pmi632-vbus-reg
- const: qcom,pm8150b-vbus-reg
reg:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-20 3:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 3:31 Stephen Rothwell [this message]
2024-02-20 8:18 ` linux-next: manual merge of the usb tree with the regulator tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2024-02-22 4:38 Stephen Rothwell
2024-02-22 7:42 ` Greg KH
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=20240220143142.540fe132@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=danila@jiaxyga.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.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