From: Linus Torvalds Date: Tue, 21 Nov 2017 07:38:41 +0000 (-1000) Subject: Merge tag 'devicetree-fixes-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.15-rc1~34 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=c633e898bde8990a34907c91b7d5245cab866c6e Merge tag 'devicetree-fixes-for-4.15' of git://git./linux/kernel/git/robh/linux Pull DeviceTree fixes from Rob Herring: - Remove mc13892 as a trivial device - Improve of_find_node_by_name() documentation - Fix unit test dtc warnings - Clean-ups of USB binding documentation - Fix potential NULL deref in of_pci_map_rid * tag 'devicetree-fixes-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: trivial-devices: Remove fsl,mc13892 of: Document exactly what of_find_node_by_name() puts of: unittest: disable interrupts_property warning of: unittest: let dtc generate __local_fixups__ dt-bindings: usb: document hub and host-controller properties dt-bindings: usb: clean up compatible property dt-bindings: usb: fix reg-property port-number range dt-bindings: usb: fix example hub node name of/pci: Fix theoretical NULL dereference --- c633e898bde8990a34907c91b7d5245cab866c6e diff --cc drivers/of/unittest-data/Makefile index 3031fc2f18f6,84b3bc44c0b4..32389acfa616 --- a/drivers/of/unittest-data/Makefile +++ b/drivers/of/unittest-data/Makefile @@@ -1,4 -1,4 +1,5 @@@ +# SPDX-License-Identifier: GPL-2.0 + DTC_FLAGS_testcases := -Wno-interrupts_property obj-y += testcases.dtb.o targets += testcases.dtb testcases.dtb.S diff --cc drivers/of/unittest-data/testcases.dts index ce49463d9d32,50b4d0d35aa0..55fe0ee20109 --- a/drivers/of/unittest-data/testcases.dts +++ b/drivers/of/unittest-data/testcases.dts @@@ -1,5 -1,6 +1,7 @@@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; + /plugin/; + / { testcase-data { changeset {