linux-next: manual merge of the mfd tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  MAINTAINERS

between commit:

  f8c667edaf80 ("dt-bindings: gpu: Add Apple SoC GPU")

from the arm-soc tree and commit:

  0f0a7bd04e7e ("dt-bindings: gpio: Add Apple Mac SMC GPIO block")

from the mfd 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 MAINTAINERS
index ca33ecd9b449,0f84051ef044..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2331,7 -2332,7 +2332,8 @@@ F:	Documentation/devicetree/bindings/ar
  F:	Documentation/devicetree/bindings/clock/apple,nco.yaml
  F:	Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml
  F:	Documentation/devicetree/bindings/dma/apple,admac.yaml
+ F:	Documentation/devicetree/bindings/gpio/apple,smc-gpio.yaml
 +F:	Documentation/devicetree/bindings/gpu/apple,agx.yaml
  F:	Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:	Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml
  F:	Documentation/devicetree/bindings/interrupt-controller/apple,*

Attachment: pgprCQ0oSiUUa.pgp
Description: OpenPGP digital signature