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

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

diff --cc drivers/of/Makefile
Simple merge

diff --cc drivers/of/base.c
index e4f95ba,a7ad101..d8574ad
--- 1/drivers/of/base.c
--- 2/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/selftest.c
Simple merge

diff --cc drivers/of/testcase-data/testcases.dts
index 8e7568e,0000000..219ef93
mode 100644,000000..100644
--- 1/drivers/of/testcase-data/testcases.dts
--- /dev/null
+++ 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"

diff --cc include/linux/of.h
Simple merge