From: Mark Brown <broonie@kernel•org>
To: Lee Jones <lee@kernel•org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Thomas Weißschuh" <linux@weissschuh•net>,
"Tzung-Bi Shih" <tzungbi@kernel•org>
Subject: linux-next: manual merge of the leds-lj tree with the chrome-platform tree
Date: Thu, 27 Jun 2024 17:26:28 +0100 [thread overview]
Message-ID: <Zn2StETOCb26F3I5@sirena.org.uk> (raw)
[-- 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 --]
next reply other threads:[~2024-06-27 16:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 16:26 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-02 4:58 linux-next: manual merge of the leds-lj tree with the chrome-platform tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zn2StETOCb26F3I5@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@weissschuh$(echo .)net \
--cc=tzungbi@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox