aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/dtc/dtx_diff
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2017-07-25 10:44:18 +1000
committerJames Morris <james.l.morris@oracle.com>2017-07-25 10:44:18 +1000
commit53a2ebaaabc1eb8458796fec3bc1e0e80746b642 (patch)
tree9d1f9227b49392cdd2edcc01057517da4f4b09c2 /scripts/dtc/dtx_diff
parentLSM: Remove security_task_create() hook. (diff)
parentLinux 4.13-rc2 (diff)
downloadlinux-53a2ebaaabc1eb8458796fec3bc1e0e80746b642.tar.gz
linux-53a2ebaaabc1eb8458796fec3bc1e0e80746b642.zip
sync to Linus v4.13-rc2 for subsystem developers to work against
Diffstat (limited to 'scripts/dtc/dtx_diff')
-rwxr-xr-xscripts/dtc/dtx_diff2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff
index ec47f95991a3..fb86f3899e16 100755
--- a/scripts/dtc/dtx_diff
+++ b/scripts/dtc/dtx_diff
@@ -338,7 +338,7 @@ DTC="${DTC} ${dtc_flags} -O dts -qq -f ${dtc_sort} -o -"
if (( ${cmd_diff} )) ; then
- diff ${diff_flags} \
+ diff ${diff_flags} --label "${dtx_file_1}" --label "${dtx_file_2}" \
<(compile_to_dts "${dtx_file_1}") \
<(compile_to_dts "${dtx_file_2}")