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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 2 Jul 2024 14:58:19 +1000

Hi all,

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

  MAINTAINERS

between commits:

  bc3e45258096 ("hwmon: add ChromeOS EC driver")
  c6ed48ef5259 ("power: supply: add ChromeOS EC based charge control driver")

from the chrome-platform tree and commit:

  8d6ce6f3ec9d ("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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index c89c84111696,a7deb8fa20ca..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5210,19 -5135,11 +5210,24 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:	sound/soc/codecs/cros_ec_codec.*
  
 +CHROMEOS EC CHARGE CONTROL
 +M:	Thomas Weißschuh <[email-masked]>
 +S:	Maintained
 +F:	drivers/power/supply/cros_charge-control.c
 +
 +CHROMEOS EC HARDWARE MONITORING
 +M:	Thomas Weißschuh <[email-masked]>
 +L:	[email-masked]
 +L:	[email-masked]
 +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-masked]>
+ S:	Maintained
+ F:	drivers/leds/leds-cros_ec.c
+ 
  CHROMEOS EC SUBDRIVERS
  M:	Benson Leung <[email-masked]>
  R:	Guenter Roeck <[email-masked]>