Re: linux-next: manual merge of the clk tree with the origin tree

[Brian Masney <masneyb@kernel.org>]

Hi Mark,

On Fri, Nov 13, 2026 at 02:42:25PM +0000, Mark Brown wrote:
> Today's linux-next merge of the clk tree got a conflict in:
> 
>   drivers/clk/socfpga/clk-s10.c
> 
> between commit:
> 
>   4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
> 
> from the origin tree and commit:
> 
>   51805c5218c7e ("clk: socfpga: stratix10: register the SP timer clocks early")

We've had 4 different conflicts in the clk tree this so far this
development cycle with that treewide commit that was introduced in
rc2. The clk-next branch is based off of various topic branches that
are merged into clk-next, so we can easily rebase clk-next. I rebased
clk-next against 7.4-rc2, and kept all of the topic branches at
7.4-rc1 because I don't want to rewrite any history there.

If there's any other merge conflicts within the clk tree this
development cycle with that treewide commit, then Jerome or I can take
care of it on our end.

Brian