Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

diff --cc Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/display/msm/qcom,sa8775p-mdss.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

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

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

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

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

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

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

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