From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Sebastian Reichel <sre@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Pengyu Luo <mitltlatltl@gmail.com>,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: linux-next: manual merge of the usb tree with the battery tree
Date: Thu, 1 May 2025 16:15:15 +1000 [thread overview]
Message-ID: <20250501161515.21916747@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
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@gmail.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-01 6:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-01 6:15 Stephen Rothwell [this message]
2025-05-02 6:20 ` linux-next: manual merge of the usb tree with the battery tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2026-04-01 13:14 Mark Brown
2026-04-01 13:44 ` Greg KH
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=20250501161515.21916747@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mitltlatltl@gmail.com \
--cc=sebastian.reichel@collabora.com \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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