Subject: linux-next: manual merge of the char-misc tree with the mfd tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Feb 2022 19:39:28 +1100

Hi all,

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

  drivers/mfd/simple-mfd-i2c.c

between commit:

  5913eb45d036 ("mfd: simple-mfd-i2c: Enable support for the silergy,sy7636a")

from the mfd tree and commit:

  d0cac2434c8e ("mfd: simple-mfd-i2c: Add Delta TN48M CPLD support")

from the char-misc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/mfd/simple-mfd-i2c.c
index f4c8fc3ee463,0d6a51ed6286..000000000000
--- a/drivers/mfd/simple-mfd-i2c.c
+++ b/drivers/mfd/simple-mfd-i2c.c
@@@ -62,19 -62,9 +62,20 @@@ static int simple_mfd_i2c_probe(struct 
  	return ret;
  }
  
 +static const struct mfd_cell sy7636a_cells[] = {
 +	{ .name = "sy7636a-regulator", },
 +	{ .name = "sy7636a-temperature", },
 +};
 +
 +static const struct simple_mfd_data silergy_sy7636a = {
 +	.mfd_cell = sy7636a_cells,
 +	.mfd_cell_size = ARRAY_SIZE(sy7636a_cells),
 +};
 +
  static const struct of_device_id simple_mfd_i2c_of_match[] = {
  	{ .compatible = "kontron,sl28cpld" },
 +	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
+ 	{ .compatible = "delta,tn48m-cpld" },
  	{}
  };
  MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);