diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-11-15 13:17:39 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-11-15 13:17:39 +0200 |
| commit | e205ceeb253723f4e4bdce619844ed678ae48276 (patch) | |
| tree | b6f5e3b21f915320a86733504faf8206569b8057 /scripts/setlocalversion | |
| parent | drm/i915/guc: Properly capture & release GuC interrupts on Gen11+ (diff) | |
| parent | Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux int... (diff) | |
| download | linux-e205ceeb253723f4e4bdce619844ed678ae48276.tar.gz linux-e205ceeb253723f4e4bdce619844ed678ae48276.zip | |
Merge drm/drm-next into drm-intel-next-queued
Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9 graphics fixes from Jon Bloomfield.").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 220dae0db3f1..a2998b118ef9 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -93,7 +93,7 @@ scm_version() # Check for mercurial and a mercurial repo. if test -d .hg && hgid=`hg id 2>/dev/null`; then # Do we have an tagged version? If so, latesttagdistance == 1 - if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then + if [ "`hg log -r . --template '{latesttagdistance}'`" = "1" ]; then id=`hg log -r . --template '{latesttag}'` printf '%s%s' -hg "$id" else |