linux-kernel - linux-next: manual merge of the usb tree with the battery 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: <20250501161515.21916747@canb.auug.org.au>
Date: Thu, 1 May 2025 16:15:15 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Sebastian Reichel <sre@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Pengyu Luo <mitltlatltl@...il.com>, Sebastian
 Reichel <sebastian.reichel@...labora.com>
Subject: linux-next: manual merge of the usb tree with the battery tree

Hi all,

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

  MAINTAINERS

between commit:

  cfe769670e82 ("power: supply: add Huawei Matebook E Go psy driver")

from the battery tree and commit:

  00327d7f2c8c ("usb: typec: ucsi: add Huawei Matebook E Go ucsi driver")

from the usb 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 f7a8c23d211c,91279eaec446..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10998,7 -10967,7 +10998,8 @@@ M:	Pengyu Luo <mitltlatltl@...il.com
  S:	Maintained
  F:	Documentation/devicetree/bindings/platform/huawei,gaokun-ec.yaml
  F:	drivers/platform/arm64/huawei-gaokun-ec.c
 +F:	drivers/power/supply/huawei-gaokun-battery.c
+ F:	drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
  F:	include/linux/platform_data/huawei-gaokun-ec.h
  
  HUGETLB SUBSYSTEM

Content of type "application/pgp-signature" skipped