From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev•pl>, Rob Herring <robh@kernel•org>
Cc: "Lee Jones" <lee@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Nuno Sá" <nuno.sa@analog•com>,
"Wolfram Sang" <wsa+renesas@sang-engineering•com>
Subject: linux-next: manual merge of the gpio-brgl tree with the devicetree tree
Date: Fri, 4 Jul 2025 18:54:18 +1000 [thread overview]
Message-ID: <20250704185418.3e7599c2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1553 bytes --]
Hi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
Documentation/devicetree/bindings/trivial-devices.yaml
between commit:
4fb2210866f7 ("dt-bindings: trivial-devices: Add Analog Devices ADT7411")
from the devicetree tree and commit:
e65e2b0d0f7e ("dt-bindings: mfd: adp5585: document adp5589 I/O expander")
from the gpio-brgl 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/trivial-devices.yaml
index db0295bf9fde,43b21fed7ec0..000000000000
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -39,10 -39,6 +39,8 @@@ properties
- ad,adm9240
# AD5110 - Nonvolatile Digital Potentiometer
- adi,ad5110
- # Analog Devices ADP5589 Keypad Decoder and I/O Expansion
- - adi,adp5589
+ # Analog Devices ADT7411 Temperature Sensor and 8-channel ADC
+ - adi,adt7411
# Analog Devices LT7182S Dual Channel 6A, 20V PolyPhase Step-Down Silent Switcher
- adi,lt7182s
# AMS iAQ-Core VOC Sensor
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-07-04 8:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-04 8:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-22 8:16 linux-next: manual merge of the gpio-brgl tree with the devicetree tree Stephen Rothwell
2021-06-23 17:26 ` Rob Herring
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=20250704185418.3e7599c2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brgl@bgdev$(echo .)pl \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nuno.sa@analog$(echo .)com \
--cc=robh@kernel$(echo .)org \
--cc=wsa+renesas@sang-engineering$(echo .)com \
/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