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

From: Mark Brown

Date: Tue Nov 10 2026 - 12:22:27 EST


Hi all,

Today's linux-next merge of the clk tree got conflicts in:

drivers/clk/hisilicon/clk-hi3559a.c
drivers/clk/hisilicon/crg-hi3516cv300.c

between commit:

4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

3865d0d4439f5 ("clk: hisilicon: Remove hi3516cv300 driver")

from the clk tree.

I fixed it up (see below) 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.

Deleted the files.

Attachment: signature.asc
Description: PGP signature