Merge remote-tracking branch 'devicetree/for-next'

# Conflicts:
#	drivers/of/of_net.c

diff --cc Documentation/devicetree/bindings/Makefile
Simple merge

diff --cc Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/arm/cpus.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/input/input.yaml
index caba93209ae755d761ed79748598ebb32764a0eb,3fc37478c0c0c1713ab1ab86cf21a0e75f4c0569..74244d21d2b3f3bb04702f50956c4d1c9e4ff243
--- 1/Documentation/devicetree/bindings/input/input.yaml
--- 2/Documentation/devicetree/bindings/input/input.yaml
+++ b/Documentation/devicetree/bindings/input/input.yaml
@@@ -32,13 -32,5 +32,12 @@@ properties
        Duration in seconds which the key should be kept pressed for device to
        power off automatically. Device with key pressed shutdown feature can
        specify this property.
-     $ref: /schemas/types.yaml#/definitions/uint32
  
 +  reset-time-sec:
 +    description:
 +      Duration in seconds which the key should be kept pressed for device to
 +      reset automatically. Device with key pressed reset feature can specify
 +      this property.
 +    $ref: /schemas/types.yaml#/definitions/uint32
 +
  additionalProperties: true

diff --cc Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/submitting-patches.rst
Simple merge

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 3926e4d5666e5b9d04147bb5ba8b17c0d9541b33,ab3bb1020d8db4d2eb7139c49b564244c73a1158..b12020fb66519eeafdea3096358600ebe62897f4
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1030,10 -1024,10 +1032,12 @@@ patternProperties
      description: Silergy Corp.
    "^silex-insight,.*":
      description: Silex Insight
+   "^siliconfile,.*":
+     description: Siliconfile Technologies lnc.
    "^siliconmitus,.*":
      description: Silicon Mitus, Inc.
 +  "^siemens,.*":
 +    description: Siemens AG
    "^simtek,.*":
      description: Cypress Semiconductor Corporation (Simtek Corporation)
    "^sinlinx,.*":

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc drivers/of/address.c
Simple merge

diff --cc drivers/of/fdt.c
Simple merge

diff --cc drivers/of/overlay.c
Simple merge

diff --cc drivers/of/property.c
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge