From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: Rob Herring <robh@kernel•org>, Frank Li <Frank.Li@nxp•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Simon Horman <horms@kernel•org>
Subject: Re: linux-next: manual merge of the devicetree tree with the input tree
Date: Fri, 20 Sep 2024 11:15:07 +1000 [thread overview]
Message-ID: <20240920111507.043f84f7@canb.auug.org.au> (raw)
In-Reply-To: <20240911150802.378ccf42@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2024-09-20 1:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20240920111507.043f84f7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Frank.Li@nxp$(echo .)com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=horms@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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