Skip to contentSkip to conversation

linux-next: manual merge of the devicetree tree with the input tree

DISCUSSION Stephen Rothwell 1 participant 2 messages Sep 11, 2024 – Sep 20, 2024 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

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

Documentation/devicetree/bindings/power/wakeup-source.txt

between commit:

45d6486d2a5a ("dt-bindings: input: touchscreen: convert ads7846.txt to yaml")

from the input tree and commit:

bb763d7890f6 ("dt-bindings: wakeup-source: update reference to m8921-keypad.yaml")

from the devicetree tree.

I fixed it up (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.

Signature · 17 lines
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/power/wakeup-source.txt
index 9a4f8310eb67,128b55be67b7..000000000000
--- a/Documentation/devicetree/bindings/power/wakeup-source.txt
+++ b/Documentation/devicetree/bindings/power/wakeup-source.txt
@@@ -25,8 -25,8 +25,8 @@@ List of legacy properties and respectiv
  2. "has-tpo"			Documentation/devicetree/bindings/rtc/rtc-opal.txt
  3. "linux,wakeup"		Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
  				Documentation/devicetree/bindings/mfd/tc3589x.txt
 -				Documentation/devicetree/bindings/input/touchscreen/ads7846.txt
 +				Documentation/devicetree/bindings/input/touchscreen/ti,ads7843.yaml
- 4. "linux,keypad-wakeup"	Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
+ 4. "linux,keypad-wakeup"	Documentation/devicetree/bindings/input/qcom,pm8921-keypad.yaml
  5. "linux,input-wakeup"		Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml
  6. "nvidia,wakeup-source"	Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
#1 lore raw

Hi all,

Quoted 28 lines · On Wed, 11 Sep 2024 15:08:02 +1000 Stephen Rothwell <[email protected]>…

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

Documentation/devicetree/bindings/power/wakeup-source.txt

between commit:

45d6486d2a5a ("dt-bindings: input: touchscreen: convert ads7846.txt to yaml")

from the input tree and commit:

bb763d7890f6 ("dt-bindings: wakeup-source: update reference to m8921-keypad.yaml")

from the devicetree tree.

I fixed it up (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.

Documentation/devicetree/bindings/power/wakeup-source.txt +0 -0
diff --cc Documentation/devicetree/bindings/power/wakeup-source.txt
index 9a4f8310eb67,128b55be67b7..000000000000

Documentation/devicetree/bindings/power/wakeup-source.txt

Quoted 9 lines
Documentation/devicetree/bindings/power/wakeup-source.txt +1 -1
@@@ -25,8 -25,8 +25,8 @@@ List of legacy properties and respectiv
  2. "has-tpo"			Documentation/devicetree/bindings/rtc/rtc-opal.txt
  3. "linux,wakeup"		Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
  				Documentation/devicetree/bindings/mfd/tc3589x.txt
 -				Documentation/devicetree/bindings/input/touchscreen/ads7846.txt
 +				Documentation/devicetree/bindings/input/touchscreen/ti,ads7843.yaml
- 4. "linux,keypad-wakeup"	Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
+ 4. "linux,keypad-wakeup"	Documentation/devicetree/bindings/input/qcom,pm8921-keypad.yaml
  5. "linux,input-wakeup"		Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml
  6. "nvidia,wakeup-source"	Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt

This is now a conflict between the input tree and Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell