From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yury Norov <yury.norov@gmail.com>, Chanwoo Choi <cw00.choi@samsung.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Subject: linux-next: manual merge of the bitmap tree with the devfreq tree
Date: Mon, 8 Sep 2025 17:51:35 +1000 [thread overview]
Message-ID: <20250908175135.4215c780@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-08 7:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-08 7:51 Stephen Rothwell [this message]
2025-09-08 11:26 ` linux-next: manual merge of the bitmap tree with the devfreq tree Nicolas Frattaroli
2025-09-08 14:22 ` Chanwoo Choi
2025-09-09 16:46 ` Yury Norov
2025-09-09 17:42 ` Nicolas Frattaroli
2025-09-09 22:09 ` Chanwoo Choi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250908175135.4215c780@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cw00.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.frattaroli@collabora.com \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox