linux-next: manual merge of the gpio-brgl tree with the devicetree tree

linux-next: manual merge of the gpio-brgl tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 824 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/gpio/gpio-davinci.txt

between commit:

  c601eef1e258 ("dt-bindings: clock: update ti,sci-clk.yaml references")

from the devicetree tree and commit:

  c830b87a761b ("dt-bindings: gpio: gpio-davinci: Convert to json-schema")

from the gpio-brgl tree.

I fixed it up (the latter removed the file, so I did that) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the gpio-brgl tree with the devicetree tree

[Rob Herring]

On Tue, Jun 22, 2021 at 2:16 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   Documentation/devicetree/bindings/gpio/gpio-davinci.txt
>
> between commit:
>
>   c601eef1e258 ("dt-bindings: clock: update ti,sci-clk.yaml references")
>
> from the devicetree tree and commit:
>
>   c830b87a761b ("dt-bindings: gpio: gpio-davinci: Convert to json-schema")
>
> from the gpio-brgl tree.
>
> I fixed it up (the latter removed the file, so I did that) and can
> carry the fix as necessary.

As the reference is gone in the schema, that is the correct resolution.

Rob

linux-next: manual merge of the gpio-brgl tree with the devicetree tree

[Stephen Rothwell]

[-- 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 --]