Subject: linux-next: manual merge of the mfd tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 9 May 2019 12:44:07 +1000

Hi all,

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

  MAINTAINERS

between commit:

  10b5d3d10759 ("MAINTAINERS: add maintainer for maxbotix ultrasonic driver")

from Linus' tree and commit:

  796fad0101d3 ("MAINTAINERS: Add an entry for MAX77650 PMIC driver")

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 77471dd6cb46,1effe9789023..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9521,13 -9414,20 +9527,27 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/sound/max9860.txt
  F:	sound/soc/codecs/max9860.*
  
 +MAXBOTIX ULTRASONIC RANGER IIO DRIVER
 +M:	Andreas Klinger <[email-masked]>
 +L:	[email-masked]
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:	drivers/iio/proximity/mb1232.c
 +
+ MAXIM MAX77650 PMIC MFD DRIVER
+ M:	Bartosz Golaszewski <[email-masked]>
+ L:	[email-masked]
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/*/*max77650.txt
+ F:	Documentation/devicetree/bindings/*/max77650*.txt
+ F:	include/linux/mfd/max77650.h
+ F:	drivers/mfd/max77650.c
+ F:	drivers/regulator/max77650-regulator.c
+ F:	drivers/power/supply/max77650-charger.c
+ F:	drivers/input/misc/max77650-onkey.c
+ F:	drivers/leds/leds-max77650.c
+ F:	drivers/gpio/gpio-max77650.c
+ 
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:	Javier Martinez Canillas <[email-masked]>
  L:	[email-masked]