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:
pgpGNB8642iC9.pgp
Description: OpenPGP digital signature
