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

[Mark Brown]

Hi all,

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

  drivers/spi/spi-amlogic-spisg.c

between commit:

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

from the origin tree and commit:

  67e3d31893ab5 ("spi: amlogic-spisg: Balance runtime PM and clock cleanup")

from the spi 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.

diff --cc drivers/spi/spi-amlogic-spisg.c
index c59df9b115eed,33c5cbf57cb87..0000000000000
--- a/drivers/spi/spi-amlogic-spisg.c
+++ b/drivers/spi/spi-amlogic-spisg.c
@@@ -706,9 -707,7 +707,7 @@@ static int aml_spisg_clk_init(struct sp
  
  	clk_set_min_rate(spisg->pclk, SPISG_PCLK_RATE_MIN);
  
- 	clk_disable_unprepare(spisg->pclk);
- 
 -	tbl = devm_kcalloc(dev, (DIV_NUM + 1), sizeof(*tbl), GFP_KERNEL);
 +	tbl = devm_kzalloc_objs(dev, *tbl, (DIV_NUM + 1));
  	if (!tbl)
  		return -ENOMEM;

Attachment: signature.asc
Description: PGP signature