summaryrefslogtreecommitdiffstats
path: root/dts/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-11-17 09:54:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-11-17 09:54:23 +0100
commit1f7229e657c3a32355c9ee912d412a806b13f58a (patch)
treede4a152c10230105446b3acd220f0c62dd8562c9 /dts/scripts
parent68a902345d0643c303379599d7d29471ca296700 (diff)
downloadbarebox-1f7229e657c3a32355c9ee912d412a806b13f58a.tar.gz
barebox-1f7229e657c3a32355c9ee912d412a806b13f58a.tar.xz
dts: update to v4.14-rc7
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/scripts')
-rwxr-xr-xdts/scripts/merge-new-release.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/scripts/merge-new-release.sh b/dts/scripts/merge-new-release.sh
index bd2dc29618..a2763c69bb 100755
--- a/dts/scripts/merge-new-release.sh
+++ b/dts/scripts/merge-new-release.sh
@@ -14,7 +14,7 @@ esac
v=$1
-set -ex
+set -e
# Use the date of Linus' originally tagged commit for the merge. This might
# differ from what the commit that the rewritten tag points to, since the