diff --git a/binutils-increase-the-max-number-of-open-fi.patch b/binutils-increase-the-max-number-of-open-fi.patch
index fcec7c0..44f6116 100644
--- a/binutils-increase-the-max-number-of-open-fi.patch
+++ b/binutils-increase-the-max-number-of-open-fi.patch
@@ -1,36 +1,3 @@
-From edf0f284b13293bb9740795131d18fe281139c48 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Sat, 16 Jan 2021 18:36:40 -0800
-Subject: [PATCH] PR binutils/23460: Increase the max number of open files to
- 20
-
-Increase the max number of open files to 20 for PR binutils/23460 test
-which may have more than 16 file descriptors open:
-
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 0 -> /dev/null
-l-wx------ 1 hjl hjl 64 Jan 16 16:49 1 -> pipe:[14151430]
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 10 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/pr23460c.o
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 11 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/pr23460d.o
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 12 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/pr23460e.o
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 13 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/pr23460f.o
-lrwx------ 1 hjl hjl 64 Jan 16 16:49 14 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/stTLiXpO
-lrwx------ 1 hjl hjl 64 Jan 16 16:49 15 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/stTLiXpO
-l-wx------ 1 hjl hjl 64 Jan 16 16:49 2 -> pipe:[14151430]
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 3 -> pipe:[13933216]
-l-wx------ 1 hjl hjl 64 Jan 16 16:49 4 -> pipe:[13933216]
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 5 -> pipe:[13990857]
-l-wx------ 1 hjl hjl 64 Jan 16 16:49 6 -> pipe:[13990857]
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 7 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/libpr23460.a
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 8 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/pr23460a.o
-lr-x------ 1 hjl hjl 64 Jan 16 16:49 9 -> /export/build/gnu/tools-build/x86_64-linux-toolchain/build-x86_64-linux/binutils/src/binutils-build/ld/tmpdir/pr23460b.o
-
-	PR binutils/23460
-	* testsuite/ld-plugin/lto.exp: Increase the max number of open
-	files to 20 for PR binutils/23460 test.
----
- ld/ChangeLog                   | 6 ++++++
- ld/testsuite/ld-plugin/lto.exp | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
 index 3c129760498..dbda6c4465d 100644
@@ -41,7 +8,7 @@ index 3c129760498..dbda6c4465d 100644
      ]
      set exec_output [run_host_cmd "sh" \
 -				  "-c \"ulimit -n 16; \
-+				  "-c \"ulimit -n 20; \
++				  "-c \" \
  				   $ar -rc $plug_opt \
  				   tmpdir/libpr23460.a \
  				   tmpdir/pr23460a.o \
diff --git a/binutils.spec b/binutils.spec
index 2db879d..caf57ad 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -2,7 +2,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?_with_debug:-debug}
 Version: 2.35.2
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -1229,6 +1229,8 @@ exit 0
 %exclude %{_libdir}/libopcodes.so
 %exclude %{_libdir}/libctf.a
 %exclude %{_libdir}/libctf-nobfd.a
+%exclude %{_libdir}/libctf.la
+%exclude %{_libdir}/libctf-nobfd.la
 %endif
 
 %if %{with gold}
@@ -1272,6 +1274,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Wed Dec 14 2022 Nick Clifton  <nickc@redhat.com> - 2.35.2-32
+- Fix special case of previous delta for s390x.   (#2151938)
+
 * Mon Dec 12 2022 Yara Ahmamd <yahmad@redhat.com> -2.35.2-31
 - Increase the max number of open files to 20.   (#2151938)
 
diff --git a/plans/ci.fmf b/plans/ci.fmf
index 1ad2c12..85710d6 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -3,4 +3,4 @@ discover:
     how: fmf
     directory: tests
 execute:
-    how: beakerlib
+    how: tmt