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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <Zn2StETOCb26F3I5@sirena.org.uk>
Date: Thu, 27 Jun 2024 17:26:28 +0100
From: Mark Brown <broonie@...nel.org>
To: Lee Jones <lee@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Thomas Weißschuh <linux@...ssschuh.net>,
	Tzung-Bi Shih <tzungbi@...nel.org>
Subject: 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
--- 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@...ssschuh.net>
 +L:	chrome-platform@...ts.linux.dev
 +L:	linux-hwmon@...r.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@...ssschuh.net>
+ S:	Maintained
+ F:	drivers/leds/leds-cros_ec.c
+ 
  CHROMEOS EC SUBDRIVERS
  M:	Benson Leung <bleung@...omium.org>
  R:	Guenter Roeck <groeck@...omium.org>

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)