From: Grant Likely <grant.likely@linaro.org>
Date: Mon, 11 Aug 2014 13:06:23 +0000 (+0100)
Subject: Merge branch 'devicetree/next-overlay' into devicetree/next
X-Git-Tag: v3.17-rc1~26^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=663d3f7c2e5e1b018a4c53277ccfde40329d98ca;p=cascardo%2Flinux.git

Merge branch 'devicetree/next-overlay' into devicetree/next

Conflicts:
	drivers/of/testcase-data/testcases.dts
---

663d3f7c2e5e1b018a4c53277ccfde40329d98ca
diff --cc drivers/of/base.c
index e4f95ba0a3eb,a7ad1013edfa..d8574adf0d62
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@@ -36,15 -35,17 +36,17 @@@ struct device_node *of_allnodes
  EXPORT_SYMBOL(of_allnodes);
  struct device_node *of_chosen;
  struct device_node *of_aliases;
 -static struct device_node *of_stdout;
 +struct device_node *of_stdout;
  
- static struct kset *of_kset;
+ struct kset *of_kset;
  
  /*
-  * Used to protect the of_aliases; but also overloaded to hold off addition of
-  * nodes to sysfs
+  * Used to protect the of_aliases, to hold off addition of nodes to sysfs.
+  * This mutex must be held whenever modifications are being made to the
+  * device tree. The of_{attach,detach}_node() and
+  * of_{add,remove,update}_property() helpers make sure this happens.
   */
- DEFINE_MUTEX(of_aliases_mutex);
+ DEFINE_MUTEX(of_mutex);
  
  /* use when traversing tree through the allnext, child, sibling,
   * or parent members of struct device_node.
diff --cc drivers/of/testcase-data/testcases.dts
index 8e7568ee3175,000000000000..219ef9324e9c
mode 100644,000000..100644
--- a/drivers/of/testcase-data/testcases.dts
+++ b/drivers/of/testcase-data/testcases.dts
@@@ -1,5 -1,0 +1,15 @@@
 +/dts-v1/;
++/ {
++	testcase-data {
++		changeset {
++			prop-update = "hello";
++			prop-remove = "world";
++			node-remove {
++			};
++		};
++	};
++};
 +#include "tests-phandle.dtsi"
 +#include "tests-interrupts.dtsi"
 +#include "tests-match.dtsi"
 +#include "tests-platform.dtsi"