diff -pruN 3.21.10-3/debian/changelog 3.21.10-3ubuntu1/debian/changelog
--- 3.21.10-3/debian/changelog	2021-11-30 20:35:14.000000000 +0000
+++ 3.21.10-3ubuntu1/debian/changelog	2022-01-12 01:06:43.000000000 +0000
@@ -1,3 +1,10 @@
+golang-github-shirou-gopsutil (3.21.10-3ubuntu1) jammy; urgency=medium
+
+  * Disable tests that rely on lscpu, as the version in Ubuntu has a bug on
+    arm64
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Tue, 11 Jan 2022 19:06:43 -0600
+
 golang-github-shirou-gopsutil (3.21.10-3) unstable; urgency=medium
 
   * Update patches to fix tests failures.
diff -pruN 3.21.10-3/debian/control 3.21.10-3ubuntu1/debian/control
--- 3.21.10-3/debian/control	2021-11-28 17:41:08.000000000 +0000
+++ 3.21.10-3ubuntu1/debian/control	2022-01-12 01:06:43.000000000 +0000
@@ -1,7 +1,8 @@
 Source: golang-github-shirou-gopsutil
 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: Martín Ferrari <tincho@debian.org>,
            Nobuhiro Iwamatsu <iwamatsu@debian.org>,
            Tim Potter <tpot@hpe.com>,
diff -pruN 3.21.10-3/debian/patches/02-disable-lscpu-tests.patch 3.21.10-3ubuntu1/debian/patches/02-disable-lscpu-tests.patch
--- 3.21.10-3/debian/patches/02-disable-lscpu-tests.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.21.10-3ubuntu1/debian/patches/02-disable-lscpu-tests.patch	2022-01-12 01:06:43.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Disable tests that rely on lscpu
+ The version of lscpu in Ubuntu is currently broken on arm64, so we disable the tests
+ that rely on it. This patch should be removed when lscpu is working again on arm64.
+ See https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1957126 for more
+ information about the lscpu bug
+Author: William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>
+Origin: Ubuntu
+Last-Update: 2022-01-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: golang-github-shirou-gopsutil-3.21.10/cpu/cpu_linux_test.go
+===================================================================
+--- golang-github-shirou-gopsutil-3.21.10.orig/cpu/cpu_linux_test.go
++++ golang-github-shirou-gopsutil-3.21.10/cpu/cpu_linux_test.go
+@@ -43,6 +43,7 @@
+ }
+ 
+ func TestCPUCountsAgainstLscpu(t *testing.T) {
++	t.Skip("Maintainer-disabled")
+ 	lscpu, err := exec.LookPath("lscpu")
+ 	if err != nil {
+ 		t.Skip("no lscpu to compare with")
+Index: golang-github-shirou-gopsutil-3.21.10/v3/cpu/cpu_linux_test.go
+===================================================================
+--- golang-github-shirou-gopsutil-3.21.10.orig/v3/cpu/cpu_linux_test.go
++++ golang-github-shirou-gopsutil-3.21.10/v3/cpu/cpu_linux_test.go
+@@ -43,6 +43,7 @@
+ }
+ 
+ func TestCPUCountsAgainstLscpu(t *testing.T) {
++	t.Skip("Maintainer-disabled")
+ 	lscpu, err := exec.LookPath("lscpu")
+ 	if err != nil {
+ 		t.Skip("no lscpu to compare with")
diff -pruN 3.21.10-3/debian/patches/series 3.21.10-3ubuntu1/debian/patches/series
--- 3.21.10-3/debian/patches/series	2021-11-22 19:49:36.000000000 +0000
+++ 3.21.10-3ubuntu1/debian/patches/series	2022-01-12 01:00:17.000000000 +0000
@@ -1 +1,2 @@
 01-Disable_failing_tests.patch
+02-disable-lscpu-tests.patch