linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

Hi Lee,

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

  drivers/mfd/syscon.c

between commit:

  3bafc09e7797 ("mfd: syscon: Add hardware spinlock support")

from Linus' tree and commit:

  34c90dcce6b1 ("mfd: syscon: Set regmap name to DT node name")

from the mfd 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/syscon.c
index 7eaa40bc703f,2c34a356a6a9..000000000000
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -88,24 -87,7 +88,25 @@@ static struct syscon *of_syscon_registe
  	if (ret)
  		reg_io_width = 4;
  
 +	ret = of_hwspin_lock_get_id(np, 0);
 +	if (ret > 0 || (IS_ENABLED(CONFIG_HWSPINLOCK) && ret == 0)) {
 +		syscon_config.use_hwlock = true;
 +		syscon_config.hwlock_id = ret;
 +		syscon_config.hwlock_mode = HWLOCK_IRQSTATE;
 +	} else if (ret < 0) {
 +		switch (ret) {
 +		case -ENOENT:
 +			/* Ignore missing hwlock, it's optional. */
 +			break;
 +		default:
 +			pr_err("Failed to retrieve valid hwlock: %d\n", ret);
 +			/* fall-through */
 +		case -EPROBE_DEFER:
 +			goto err_regmap;
 +		}
 +	}
 +
+ 	syscon_config.name = of_node_full_name(np);
  	syscon_config.reg_stride = reg_io_width;
  	syscon_config.val_bits = reg_io_width * 8;
  	syscon_config.max_register = resource_size(&res) - reg_io_width;

Attachment: pgpQpVXf9II4b.pgp
Description: OpenPGP digital signature