linux-kernel - linux-next: manual merge of the devfreq tree with the origin 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: <20241209114409.3cdd6fea@canb.auug.org.au>
Date: Mon, 9 Dec 2024 11:44:09 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Chanwoo Choi <cw00.choi@...sung.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Uwe Kleine-König
 <u.kleine-koenig@...libre.com>
Subject: linux-next: manual merge of the devfreq tree with the origin tree

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

Content of type "application/pgp-signature" skipped