diff -pruN 7.1.0-1/debian/changelog 7.1.0-1ubuntu1/debian/changelog
--- 7.1.0-1/debian/changelog	2025-10-05 06:26:16.000000000 +0000
+++ 7.1.0-1ubuntu1/debian/changelog	2025-10-21 09:11:50.000000000 +0000
@@ -1,3 +1,10 @@
+python-psutil (7.1.0-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - linux: handle missing /sys/class/power_supply in sensors_battery()
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Tue, 21 Oct 2025 11:11:50 +0200
+
 python-psutil (7.1.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -7,6 +14,12 @@ python-psutil (7.1.0-1) unstable; urgenc
 
  -- Sandro Tosi <morph@debian.org>  Sun, 05 Oct 2025 02:26:16 -0400
 
+python-psutil (7.0.0-2ubuntu1) questing; urgency=medium
+
+  * linux: handle missing /sys/class/power_supply in sensors_battery()
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Mon, 30 Jun 2025 14:11:02 +0200
+
 python-psutil (7.0.0-2) unstable; urgency=medium
 
   * debian/rules
diff -pruN 7.1.0-1/debian/control 7.1.0-1ubuntu1/debian/control
--- 7.1.0-1/debian/control	2025-10-05 06:26:16.000000000 +0000
+++ 7.1.0-1ubuntu1/debian/control	2025-10-21 09:11:50.000000000 +0000
@@ -1,7 +1,8 @@
 Source: python-psutil
 Section: python
 Priority: optional
-Maintainer: Sandro Tosi <morph@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sandro Tosi <morph@debian.org>
 Build-Depends: debhelper-compat (= 13),
                procps,
                pybuild-plugin-pyproject,
diff -pruN 7.1.0-1/debian/patches/linux-handle-missing-sys-class-power_supply-in-sensors_ba.patch 7.1.0-1ubuntu1/debian/patches/linux-handle-missing-sys-class-power_supply-in-sensors_ba.patch
--- 7.1.0-1/debian/patches/linux-handle-missing-sys-class-power_supply-in-sensors_ba.patch	1970-01-01 00:00:00.000000000 +0000
+++ 7.1.0-1ubuntu1/debian/patches/linux-handle-missing-sys-class-power_supply-in-sensors_ba.patch	2025-10-21 09:10:47.000000000 +0000
@@ -0,0 +1,45 @@
+From: Benjamin Drung <benjamin.drung@canonical.com>
+Date: Mon, 30 Jun 2025 14:01:07 +0200
+Subject: linux: handle missing /sys/class/power_supply in sensors_battery()
+
+The test `TestModuleFunctionsLeaks.test_sensors_battery` fails on Ubuntu
+s390x in `sensors_battery` with:
+
+```
+FileNotFoundError: [Errno 2] No such file or directory: '/sys/class/power_supply'
+```
+
+Fix `sensors_battery` to return `None` in case `POWER_SUPPLY_PATH` does
+not exist.
+
+Fixes: https://github.com/giampaolo/psutil/issues/2067
+Forwarded: https://github.com/giampaolo/psutil/pull/2595
+Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>
+---
+ psutil/_pslinux.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
+index 8cc64e9..94d3da6 100644
+--- a/psutil/_pslinux.py
++++ b/psutil/_pslinux.py
+@@ -1470,11 +1470,14 @@ def sensors_battery():
+                     return ret.strip()
+         return None
+ 
+-    bats = [
+-        x
+-        for x in os.listdir(POWER_SUPPLY_PATH)
+-        if x.startswith('BAT') or 'battery' in x.lower()
+-    ]
++    try:
++        bats = [
++            x
++            for x in os.listdir(POWER_SUPPLY_PATH)
++            if x.startswith('BAT') or 'battery' in x.lower()
++        ]
++    except FileNotFoundError:
++        return None
+     if not bats:
+         return None
+     # Get the first available battery. Usually this is "BAT0", except
diff -pruN 7.1.0-1/debian/patches/series 7.1.0-1ubuntu1/debian/patches/series
--- 7.1.0-1/debian/patches/series	2025-10-05 06:26:16.000000000 +0000
+++ 7.1.0-1ubuntu1/debian/patches/series	2025-10-21 09:10:47.000000000 +0000
@@ -1,2 +1,3 @@
 0001-dont-depend-on-install-when-running-tests.patch
 0002-pass-PYTHONPATH-to-the-test-runner.patch
+linux-handle-missing-sys-class-power_supply-in-sensors_ba.patch