linux-next: manual merge of the mux tree with the battery tree

linux-next: manual merge of the mux tree with the battery tree

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  fe8e81b7e899 ("adp5061: New driver for ADP5061 I2C battery charger")

from the battery tree and commit:

  703160ff3e50 ("dt-bindings: mux: add adi,adgs1408")

from the mux 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 db24b8939ed4,eaa2b55a0e9b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -829,13 -810,12 +829,19 @@@ L:	linux-media@vger.kernel.or
  S:	Maintained
  F:	drivers/media/i2c/ad9389b*
  
+ ANALOG DEVICES INC ADGS1408 DRIVER
+ M:	Mircea Caprioru <mircea.caprioru@analog.com>
+ S:	Supported
+ F:	drivers/mux/adgs1408.c
+ F:	Documentation/devicetree/bindings/mux/adgs1408.txt
+ 
 +ANALOG DEVICES INC ADP5061 DRIVER
 +M:	Stefan Popa <stefan.popa@analog.com>
 +L:	linux-pm@vger.kernel.org
 +W:	http://ez.analog.com/community/linux-device-drivers
 +S:	Supported
 +F:	drivers/power/supply/adp5061.c
 +
  ANALOG DEVICES INC ADV7180 DRIVER
  M:	Lars-Peter Clausen <lars@metafoo.de>
  L:	linux-media@vger.kernel.org

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