From ca563b9b948aec18463c26e9f87ae7933571b40e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 1 Sep 2020 17:50:51 +0200
Subject: [PATCH] patch 8.2.1559: s390x tests work again

Problem:    s390x tests work again.
Solution:   re-enable s390x tests. (James McCoy, closes #6829)
---
 .travis.yml   | 13 ++++++-------
 src/version.c |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f72e064e..356a8c10c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -212,13 +212,12 @@ jobs:
       env:
         - *normal
         - *shadowopt
-    # Temporarily disabled, always fails
-    #- <<: *linux
-    #  arch: s390x
-    #  name: huge/gcc-s390x
-    #  compiler: gcc
-    #  env: *linux-huge
-    #  services: []
+    - <<: *linux
+      arch: s390x
+      name: huge/gcc-s390x
+      compiler: gcc
+      env: *linux-huge
+      services: []
     - <<: *linux
       arch: arm64
       name: huge/gcc-arm64
diff --git a/src/version.c b/src/version.c
index 411a889d5..158f2a347 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1559,
 /**/
     1558,
 /**/
-- 
2.40.0