summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml13
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index d199efb573..a4c6287404 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -208,12 +208,13 @@ jobs:
env:
- *normal
- *shadowopt
- - <<: *linux
- arch: s390x
- name: huge/gcc-s390x
- compiler: gcc
- env: *linux-huge
- services: []
+ # Temporarily disabled, always fails
+ #- <<: *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 15f4c061d2..697a47cf9c 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 */
/**/
+ 1402,
+/**/
1401,
/**/
1400,