linux-kernel - linux-next: manual merge of the devicetree tree with the devicetree-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141120145016.19160b8b@canb.auug.org.au>
Date:	Thu, 20 Nov 2014 14:50:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the devicetree tree with the
 devicetree-current tree

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/unittest.c between commit 817d2001c709 ("of/selftest: Fix
testing when /aliases is missing") from the devicetree-current tree and
commit 5063e25a302e ("of: Eliminate of_allnodes list") from the
devicetree tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/of/unittest.c
index ae8b75904104,082bb2b6a5ad..000000000000
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@@ -853,19 -858,20 +858,23 @@@ static int __init selftest_data_add(voi
  
  		for_each_of_allnodes(np)
  			__of_attach_node_sysfs(np);
 -		of_aliases = of_find_node_by_path("/aliases");
 -		of_chosen = of_find_node_by_path("/chosen");
 -		return 0;
 +	} else {
 +		/* attach the sub-tree to live tree */
- 		rc = attach_node_and_children(selftest_data_node);
- 		if (WARN_ON(rc))
- 			return rc;
++		np = selftest_data_node->child;
++		while (np) {
++			struct device_node *next = np->sibling;
++			np->parent = of_root;
++			attach_node_and_children(np);
++			np = next;
++		}
  	}
  
 -	/* attach the sub-tree to live tree */
 -	np = selftest_data_node->child;
 -	while (np) {
 -		struct device_node *next = np->sibling;
 -		np->parent = of_root;
 -		attach_node_and_children(np);
 -		np = next;
 -	}
 +	/* Make sure of_aliases and of_chosen are up-to-date */
 +	if (!of_aliases)
 +		of_aliases = of_find_node_by_path("/aliases");
 +	if (!of_chosen)
 +		of_chosen = of_find_node_by_path("/chosen");
- 	return rc;
+ 	return 0;
  }
  
  /**

Content of type "application/pgp-signature" skipped