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

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

[Mark Brown]

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

Hi all,

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

  drivers/power/sequencing/pwrseq-pcie-m2.c

between commit:

  5c3daa5301693 ("power: sequencing: pcie-m2: Fix device node reference leak in probe")

from the origin tree and commit:

  0d38285a12a28 ("power: sequencing: pcie-m2: Add support for PCIe M.2 Key E connectors")

from the pwrseq 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/power/sequencing/pwrseq-pcie-m2.c
index dadb4aad9d5d4,a75ca4fda2eb3..0000000000000
--- a/drivers/power/sequencing/pwrseq-pcie-m2.c
+++ b/drivers/power/sequencing/pwrseq-pcie-m2.c
@@@ -109,7 -386,8 +386,8 @@@ static int pwrseq_pcie_m2_probe(struct 
  	if (!ctx)
  		return -ENOMEM;
  
- 	ctx->of_node = dev_of_node(dev);
 -	platform_set_drvdata(pdev, ctx);
+ 	ctx->of_node = of_node_get(dev->of_node);
++	platform_set_drvdata(pdev, ctx);
  	ctx->pdata = device_get_match_data(dev);
  	if (!ctx->pdata)
  		return dev_err_probe(dev, -ENODEV,

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