* linux-next: manual merge of the devfreq tree with the origin tree
@ 2024-12-09 0:44 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-12-09 0:44 UTC (permalink / raw)
To: Chanwoo Choi
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List, Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
Hi all,
Today's linux-next merge of the devfreq tree got conflicts in:
drivers/devfreq/event/exynos-nocp.c
drivers/devfreq/event/exynos-ppmu.c
drivers/devfreq/mtk-cci-devfreq.c
drivers/devfreq/rk3399_dmc.c
drivers/devfreq/sun8i-a33-mbus.c
between commit:
e70140ba0d2b ("Get rid of 'remove_new' relic from platform driver struct")
from the origin tree and commit:
1f8ac4b95fee ("PM / devfreq: Switch back to struct platform_driver::remove()")
from the devfreq tree.
I fixed it up (I just used the latter versions - only white space changes)
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-12-09 0:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-09 0:44 linux-next: manual merge of the devfreq tree with the origin tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox