diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/changelog golang-github-valyala-fasthttp-1.31.0/debian/changelog
--- golang-github-valyala-fasthttp-1.31.0/debian/changelog	2021-11-29 11:48:27.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/changelog	2022-03-16 13:54:45.000000000 +0000
@@ -1,3 +1,11 @@
+golang-github-valyala-fasthttp (1:1.31.0-3ubuntu1) jammy; urgency=medium
+
+  * debian/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch:
+    Add appropriate build tags for s390x. This fixes an autopkgtest regression
+    on this architecture (LP: #1965134).
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Wed, 16 Mar 2022 09:54:45 -0400
+
 golang-github-valyala-fasthttp (1:1.31.0-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/control golang-github-valyala-fasthttp-1.31.0/debian/control
--- golang-github-valyala-fasthttp-1.31.0/debian/control	2021-11-26 18:24:38.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/control	2022-03-16 13:54:45.000000000 +0000
@@ -1,7 +1,8 @@
 Source: golang-github-valyala-fasthttp
 Section: golang
 Priority: optional
-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders:
  Nobuhiro Iwamatsu <iwamatsu@debian.org>,
 Build-Depends:
diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch golang-github-valyala-fasthttp-1.31.0/debian/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch
--- golang-github-valyala-fasthttp-1.31.0/debian/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch	2022-03-16 13:54:45.000000000 +0000
@@ -0,0 +1,73 @@
+Description: Add appropriate build tags for s390x
+ The bytesconv 32-bit tests fail on s390x, because it is a 64-bit
+ architecture. Add the appropriate build flags so that 32-bit tests do
+ not run on this architecture.
+Author: Nick Rosbrook <nick.rosbrook@canonical.com>
+Forwarded: https://github.com/valyala/fasthttp/pull/1250
+Last-Update: 2022-03-16
+---
+From d6c6e4a7cc9c17158dc2c93090e5b7d26ca42e15 Mon Sep 17 00:00:00 2001
+From: Nick Rosbrook <nr@enr0n.net>
+Date: Wed, 16 Mar 2022 09:41:03 -0400
+Subject: [PATCH] bytesconv: add appropriate build tags for s390x
+
+The bytesconv 32-bit tests fail on s390x, because it is a 64-bit
+architecture. Add the appropriate build flags so that 32-bit tests do
+not run on this architecture.
+---
+ bytesconv_32.go      | 4 ++--
+ bytesconv_32_test.go | 4 ++--
+ bytesconv_64.go      | 4 ++--
+ bytesconv_64_test.go | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+diff --git a/bytesconv_32.go b/bytesconv_32.go
+index 6a6fec2..b574883 100644
+--- a/bytesconv_32.go
++++ b/bytesconv_32.go
+@@ -1,5 +1,5 @@
+-//go:build !amd64 && !arm64 && !ppc64 && !ppc64le
+-// +build !amd64,!arm64,!ppc64,!ppc64le
++//go:build !amd64 && !arm64 && !ppc64 && !ppc64le && !s390x
++// +build !amd64,!arm64,!ppc64,!ppc64le,!s390x
+ 
+ package fasthttp
+ 
+diff --git a/bytesconv_32_test.go b/bytesconv_32_test.go
+index cec5aa9..3f5d5de 100644
+--- a/bytesconv_32_test.go
++++ b/bytesconv_32_test.go
+@@ -1,5 +1,5 @@
+-//go:build !amd64 && !arm64 && !ppc64 && !ppc64le
+-// +build !amd64,!arm64,!ppc64,!ppc64le
++//go:build !amd64 && !arm64 && !ppc64 && !ppc64le && !s390x
++// +build !amd64,!arm64,!ppc64,!ppc64le,!s390x
+ 
+ package fasthttp
+ 
+diff --git a/bytesconv_64.go b/bytesconv_64.go
+index 1300d5a..94d0ec6 100644
+--- a/bytesconv_64.go
++++ b/bytesconv_64.go
+@@ -1,5 +1,5 @@
+-//go:build amd64 || arm64 || ppc64 || ppc64le
+-// +build amd64 arm64 ppc64 ppc64le
++//go:build amd64 || arm64 || ppc64 || ppc64le || s390x
++// +build amd64 arm64 ppc64 ppc64le s390x
+ 
+ package fasthttp
+ 
+diff --git a/bytesconv_64_test.go b/bytesconv_64_test.go
+index 5351591..0689809 100644
+--- a/bytesconv_64_test.go
++++ b/bytesconv_64_test.go
+@@ -1,5 +1,5 @@
+-//go:build amd64 || arm64 || ppc64 || ppc64le
+-// +build amd64 arm64 ppc64 ppc64le
++//go:build amd64 || arm64 || ppc64 || ppc64le || s390x
++// +build amd64 arm64 ppc64 ppc64le s390x
+ 
+ package fasthttp
+ 
+-- 
+2.32.0
+
diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/patches/series golang-github-valyala-fasthttp-1.31.0/debian/patches/series
--- golang-github-valyala-fasthttp-1.31.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/patches/series	2022-03-16 13:54:45.000000000 +0000
@@ -0,0 +1 @@
+0001-bytesconv-add-appropriate-build-tags-for-s390x.patch