summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml13
-rw-r--r--src/version.c2
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
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1559,
+/**/
1558,
/**/
1557,