From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2016 18:32:01 +0000 (-0700)
Subject: Merge tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh... 
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=f64d6e2aaa79f0ad588fd7ad595a0a8eb8f04645;p=deliverable%2Flinux.git

Merge tag 'devicetree-for-4.8' of git://git./linux/kernel/git/robh/linux

Pull DeviceTree updates from Rob Herring:

 - remove most of_platform_populate() calls in arch code.  Now the DT
   core code calls it in the default case and platforms only need to
   call it if they have special needs

 - use pr_fmt on all the DT core print statements

 - CoreSight binding doc improvements to block name descriptions

 - add dt_to_config script which can parse dts files and list
   corresponding kernel config options

 - fix memory leak hit with a PowerMac DT

 - correct a bunch of STMicro compatible strings to use the correct
   vendor prefix

 - fix DA9052 PMIC binding doc to match what is actually used in dts
   files

* tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (35 commits)
  documentation: da9052: Update regulator bindings names to match DA9052/53 DTS expectations
  xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table"
  xtensa: Fix build error due to missing include file
  MIPS: ath79: Add missing include file
  Fix spelling errors in Documentation/devicetree
  ARM: dts: fix STMicroelectronics compatible strings
  powerpc/dts: fix STMicroelectronics compatible strings
  Documentation: dt: i2c: use correct STMicroelectronics vendor prefix
  scripts/dtc: dt_to_config - kernel config options for a devicetree
  of: fdt: mark unflattened tree as detached
  of: overlay: add resolver error prints
  coresight: document binding acronyms
  Documentation/devicetree: document cavium-pip rx-delay/tx-delay properties
  of: use pr_fmt prefix for all console printing
  of/irq: Mark initialised interrupt controllers as populated
  of: fix memory leak related to safe_name()
  Revert "of/platform: export of_default_bus_match_table"
  of: unittest: use of_platform_default_populate() to populate default bus
  memory: omap-gpmc: use of_platform_default_populate() to populate default bus
  bus: uniphier-system-bus: use of_platform_default_populate() to populate default bus
  ...
---

f64d6e2aaa79f0ad588fd7ad595a0a8eb8f04645
diff --cc arch/arc/kernel/setup.c
index 5f8c0b47045a,584c5f064ff3..a946400a86d0
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@@ -14,8 -14,6 +14,7 @@@
  #include <linux/module.h>
  #include <linux/cpu.h>
  #include <linux/of_fdt.h>
 +#include <linux/of.h>
- #include <linux/of_platform.h>
  #include <linux/cache.h>
  #include <asm/sections.h>
  #include <asm/arcregs.h>