linux-next: manual merge of the leds-lj tree with the chrome-platform tree

Hi all,

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

MAINTAINERS

between commit:

bc3e45258096f ("hwmon: add ChromeOS EC driver")

from the chrome-platform tree and commit:

8d6ce6f3ec9d5 ("leds: Add ChromeOS EC driver")

from the leds-lj 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 MAINTAINERS
index de839b7c4ac2a,a7deb8fa20cac..0000000000000
@@@ -5197,14 -5135,11 +5197,19 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:	sound/soc/codecs/cros_ec_codec.*
  
 +CHROMEOS EC HARDWARE MONITORING
 +M:	Thomas Weißschuh <[email protected]>
 +L:	[email protected]
 +L:	[email protected]
 +S:	Maintained
 +F:	Documentation/hwmon/cros_ec_hwmon.rst
 +F:	drivers/hwmon/cros_ec_hwmon.c
 +
+ CHROMEOS EC LED DRIVER
+ M:	Thomas Weißschuh <[email protected]>
+ S:	Maintained
+ F:	drivers/leds/leds-cros_ec.c
+ 
  CHROMEOS EC SUBDRIVERS
  M:	Benson Leung <[email protected]>
  R:	Guenter Roeck <[email protected]>