Subject: linux-next: manual merge of the pinctrl tree with the devicetree tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Apr 2022 14:46:56 +1000

Hi all,

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

  Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt

between commit:

  998282c6dad8 ("dt-bindings: qcom,pdc: Add SM6350 compatible")

from the devicetree tree and commit:

  6d289c378af4 ("dt-bindings: qcom,pdc: Add compatible for SM8150")

from the pinctrl tree.

I fixed it up (see below - I "corrected" the SM8150 in line with the former
commit) 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/interrupt-controller/qcom,pdc.txt
index 3b7b1134dea9,bd3539644d3f..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
@@@ -21,9 -21,9 +21,10 @@@ Properties
  		    - "qcom,sc7180-pdc": For SC7180
  		    - "qcom,sc7280-pdc": For SC7280
  		    - "qcom,sdm845-pdc": For SDM845
 -		    - "qcom,sdm8150-pdc": For SM8150
 -		    - "qcom,sdm8250-pdc": For SM8250
 -		    - "qcom,sdm8350-pdc": For SM8350
 +		    - "qcom,sm6350-pdc": For SM6350
++		    - "qcom,sm8150-pdc": For SM8150
 +		    - "qcom,sm8250-pdc": For SM8250
 +		    - "qcom,sm8350-pdc": For SM8350
  
  - reg:
  	Usage: required