* linux-next: manual merge of the devicetree tree with the input tree
@ 2024-09-11 5:08 Stephen Rothwell
2024-09-20 1:15 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-11 5:08 UTC (permalink / raw)
To: Rob Herring, Dmitry Torokhov
Cc: Frank Li, Linux Kernel Mailing List, Linux Next Mailing List,
Simon Horman
[-- Attachment #1: Type: text/plain, Size: 1854 bytes --]
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.
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the input tree
2024-09-11 5:08 linux-next: manual merge of the devicetree tree with the input tree Stephen Rothwell
@ 2024-09-20 1:15 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-20 1:15 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Rob Herring, Frank Li, Linux Kernel Mailing List,
Linux Next Mailing List, Simon Horman
[-- Attachment #1: Type: text/plain, Size: 2078 bytes --]
Hi all,
On Wed, 11 Sep 2024 15:08:02 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
>
> 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
>
This is now a conflict between the input tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-20 1:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-11 5:08 linux-next: manual merge of the devicetree tree with the input tree Stephen Rothwell
2024-09-20 1:15 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox