linux-next: manual merge of the phy-next tree with the qcom tree

Stephen Rothwell
2022-01-28T01:27:01Z

[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]

Hi all,

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

Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt

between commit:

c04421c68fd4 ("dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible")

from the qcom tree and commit:

e7393b60a14f ("dt-bindings: phy: convert Qualcomm USB HS phy to yaml")

from the phy-next tree.

I fixed it up (I removed the file and added the following merge fix patch)
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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jan 2022 12:24:35 +1100
Subject: [PATCH] merge fix for "dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 1 +
1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
index a60386bd19b2..e23e5590eaa3 100644
--- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
@@ -38,6 +38,7 @@ properties:
items:
- enum:
- qcom,usb-hs-phy-apq8064
+ - qcom,usb-hs-phy-msm8226
- qcom,usb-hs-phy-msm8916
- qcom,usb-hs-phy-msm8974
- const: qcom,usb-hs-phy
--
2.34.1

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]