* linux-next: manual merge of the extcon tree with the origin tree
@ 2024-12-06 13:46 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2024-12-06 13:46 UTC (permalink / raw)
To: Chanwoo Choi
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List, Uwe Kleine-König,
Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 769 bytes --]
Hi all,
Today's linux-next merge of the extcon tree got a conflict in:
drivers/extcon/extcon-usbc-cros-ec.c
between commit:
e70140ba0d2b1 ("Get rid of 'remove_new' relic from platform driver struct")
from the origin tree and commit:
a5bca5c3931ba ("extcon: Switch back to struct platform_driver::remove()")
from the extcon 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.
(no diff, used Linus' version.)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-12-06 13:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-06 13:46 linux-next: manual merge of the extcon tree with the origin tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox