diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 08:38:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 08:38:58 +0100 |
| commit | bb3a151dd42765acc8f469ff994de3ab31f15a95 (patch) | |
| tree | 87cd7da605aacb88aae36f4e69f255537e78e8fa /scripts | |
| parent | 1f836f5b10f2524d33efde47d2b694b861ecf319 (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| download | linux-bb3a151dd42765acc8f469ff994de3ab31f15a95.tar.gz linux-bb3a151dd42765acc8f469ff994de3ab31f15a95.tar.bz2 linux-bb3a151dd42765acc8f469ff994de3ab31f15a95.zip | |
Merge 5.6-rc5 into char-misc-next
We need the binder and other fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/parse-maintainers.pl | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index bae62549e3d2..752ff0a225a9 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -300,15 +300,15 @@ DT_BINDING_DIR := Documentation/devicetree/bindings DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml quiet_cmd_dtb_check = CHECK $@ - cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ ; + cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ -define rule_dtc_dt_yaml +define rule_dtc $(call cmd_and_fixdep,dtc,yaml) $(call cmd,dtb_check) endef $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_rule,dtc_dt_yaml) + $(call if_changed_rule,dtc) dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) diff --git a/scripts/parse-maintainers.pl b/scripts/parse-maintainers.pl index 255cef1b098d..255cef1b098d 100644..100755 --- a/scripts/parse-maintainers.pl +++ b/scripts/parse-maintainers.pl |