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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml

between commit:

  6b5ef8c88854b ("dt-bindings: gpio: fix microchip #interrupt-cells")

from the gpio-brgl-fixes tree and commit:

  ececb46fc9477 ("dt-bindings: gpio: fix microchip,mpfs-gpio interrupt documentation")

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.

diff --cc Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
index f42c54653d521,6a0c5341d8a42..0000000000000
--- a/Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
+++ b/Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
@@@ -82,18 -90,19 +90,19 @@@ examples
          compatible = "microchip,mpfs-gpio";
          reg = <0x20122000 0x1000>;
          clocks = <&clkcfg 25>;
-         interrupt-parent = <&plic>;
+         interrupt-parent = <&irqmux>;
          gpio-controller;
          #gpio-cells = <2>;
+         ngpios = <32>;
          interrupt-controller;
 -        #interrupt-cells = <1>;
 +        #interrupt-cells = <2>;
-         interrupts = <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>,
-                      <53>, <53>, <53>, <53>;
+         interrupts = <64>, <65>, <66>, <67>,
+                      <68>, <69>, <70>, <71>,
+                      <72>, <73>, <74>, <75>,
+                      <76>, <77>, <78>, <79>,
+                      <80>, <81>, <82>, <83>,
+                      <84>, <85>, <86>, <87>,
+                      <88>, <89>, <90>, <91>,
+                      <92>, <93>, <94>, <95>;
      };
  ...

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