* linux-next: manual merge of the leds-lj tree with the chrome-platform tree
@ 2024-06-27 16:26 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2024-06-27 16:26 UTC (permalink / raw)
To: Lee Jones
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Weißschuh, Tzung-Bi Shih
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
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
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -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 <thomas@weissschuh•net>
+L: chrome-platform@lists•linux.dev
+L: linux-hwmon@vger•kernel.org
+S: Maintained
+F: Documentation/hwmon/cros_ec_hwmon.rst
+F: drivers/hwmon/cros_ec_hwmon.c
+
+ CHROMEOS EC LED DRIVER
+ M: Thomas Weißschuh <thomas@weissschuh•net>
+ S: Maintained
+ F: drivers/leds/leds-cros_ec.c
+
CHROMEOS EC SUBDRIVERS
M: Benson Leung <bleung@chromium•org>
R: Guenter Roeck <groeck@chromium•org>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the leds-lj tree with the chrome-platform tree
@ 2024-07-02 4:58 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-07-02 4:58 UTC (permalink / raw)
To: Lee Jones, Benson Leung, Guenter Roeck, Dmitry Torokhov
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Weißschuh, Tzung-Bi Shih
[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]
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 <thomas@weissschuh•net>
+S: Maintained
+F: drivers/power/supply/cros_charge-control.c
+
+CHROMEOS EC HARDWARE MONITORING
+M: Thomas Weißschuh <thomas@weissschuh•net>
+L: chrome-platform@lists•linux.dev
+L: linux-hwmon@vger•kernel.org
+S: Maintained
+F: Documentation/hwmon/cros_ec_hwmon.rst
+F: drivers/hwmon/cros_ec_hwmon.c
+
+ CHROMEOS EC LED DRIVER
+ M: Thomas Weißschuh <thomas@weissschuh•net>
+ S: Maintained
+ F: drivers/leds/leds-cros_ec.c
+
CHROMEOS EC SUBDRIVERS
M: Benson Leung <bleung@chromium•org>
R: Guenter Roeck <groeck@chromium•org>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-02 4:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-27 16:26 linux-next: manual merge of the leds-lj tree with the chrome-platform tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2024-07-02 4:58 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox