linux-kernel - linux-next: manual merge of the bitmap tree with the devfreq 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250908175135.4215c780@canb.auug.org.au>
Date: Mon, 8 Sep 2025 17:51:35 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Yury Norov <yury.norov@...il.com>, Chanwoo Choi <cw00.choi@...sung.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Nicolas Frattaroli
 <nicolas.frattaroli@...labora.com>
Subject: linux-next: manual merge of the bitmap tree with the devfreq tree

Hi all,

Today's linux-next merge of the bitmap tree got a conflict in:

  drivers/devfreq/event/rockchip-dfi.c

between commit:

  7d9e29ed3f8e ("PM / devfreq: rockchip-dfi: add support for LPDDR5")

from the devfreq tree and commit:

  414054a0bc1f ("PM / devfreq: rockchip-dfi: switch to FIELD_PREP_WM16 macro")

from the bitmap tree.

I have no idea how to fix this up, so I dropped the changes from the
bitmap tree for today.  Someone should supply me with the appropriate
resolution.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped