block/partitions/of: Fix of_node reference leak in of_partition()

[blktests-ci]

Pull request for series with
subject: block/partitions/of: Fix of_node reference leak in of_partition()
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1116407

[blktests-ci]

Upstream branch: b9e3062
series: https://patchwork.kernel.org/project/linux-block/list/?series=1116407
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1116407
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: block/partitions/of: Fix of_node reference leak in of_partition()
Using index info to reconstruct a base tree...
M	block/partitions/of.c
Falling back to patching base and 3-way merge...
Auto-merging block/partitions/of.c
CONFLICT (content): Merge conflict in block/partitions/of.c
Patch failed at 0001 block/partitions/of: Fix of_node reference leak in of_partition()
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc block/partitions/of.c
index 53664ea06b65,e0a60c2191bc..000000000000
--- a/block/partitions/of.c
+++ b/block/partitions/of.c
@@@ -73,10 -73,11 +73,18 @@@ int of_partition(struct parsed_partitio
  
  	struct device_node *partitions_np = of_node_get(ddev->of_node);
  
++<<<<<<< HEAD
 +	if (!partitions_np ||
 +	    !of_device_is_compatible(partitions_np, "fixed-partitions")) {
 +		of_node_put(partitions_np);
 +		return 0;
++=======
+ 	if (!partitions_np)
+ 		return 0;
+ 	if (!of_device_is_compatible(partitions_np, "fixed-partitions")) {
+ 		of_node_put(partitions_np);
+ 		return 0;
++>>>>>>> block/partitions/of: Fix of_node reference leak in of_partition()
  	}
  
  	slot = 1;
@@@ -107,5 -108,6 +115,9 @@@
  	seq_buf_puts(&state->pp_buf, "\n");
  
  	of_node_put(partitions_np);
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> block/partitions/of: Fix of_node reference leak in of_partition()
  	return 1;
  }