linux-next: manual merge of the devicetree tree with the qcom tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]

Hi Rob,

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

  drivers/soc/qcom/apr.c

between commit:

  4fadb26574cb ("soc: qcom: apr: Avoid string overflow")

from the qcom tree and commit:

  b2efb5b04591 ("soc: Convert to using %pOFn instead of device_node.name")

from the devicetree 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/soc/qcom/apr.c
index 716762d59c1f,4bda793ba6ae..000000000000
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@@ -219,9 -219,9 +219,9 @@@ static int apr_add_device(struct devic
  	adev->domain_id = id->domain_id;
  	adev->version = id->svc_version;
  	if (np)
- 		strscpy(adev->name, np->name, APR_NAME_SIZE);
+ 		snprintf(adev->name, APR_NAME_SIZE, "%pOFn", np);
  	else
 -		strncpy(adev->name, id->name, APR_NAME_SIZE);
 +		strscpy(adev->name, id->name, APR_NAME_SIZE);
  
  	dev_set_name(&adev->dev, "aprsvc:%s:%x:%x", adev->name,
  		     id->domain_id, id->svc_id);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]