diff --git a/debian/changelog b/debian/changelog
index 368e1706..bea680b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; urgency=medium
+
+  * revert debian/patches/arm32-defaults.diff for causing
+    https://lore.kernel.org/lkml/20231204225148.GA2094126@dev-arch.thelio-3990X/T/
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Dec 2023 07:43:43 +0100
+
 llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp1) experimental; urgency=medium
 
   [ Sylvestre Ledru ]
@@ -77,6 +84,18 @@ llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Jul 2023 23:52:42 +0200
 
+llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Add new cmake-clang-test to spot issues such as
+    Debian bug #1057151
+  * Fix cmake file (Closes: #1057151)
+
+  [ Matthias Klose ]
+  * Also use the free swap to determine the number of parallel processes.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
+
 llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff
deleted file mode 100644
index 7266cc8f..00000000
--- a/debian/patches/arm32-defaults.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/llvm/lib/TargetParser/ARMTargetParser.cpp
-+++ b/llvm/lib/TargetParser/ARMTargetParser.cpp
-@@ -603,6 +603,15 @@ StringRef ARM::getARMCPUForArch(const ll
-     if (MArch == "v7k")
-       return "cortex-a7";
-     break;
-+  case llvm::Triple::Linux:
-+    switch (Triple.getEnvironment()) {
-+    case llvm::Triple::GNUEABI:
-+      return "arm9e"; // armv5te
-+    case llvm::Triple::GNUEABIHF:
-+      return "cortex-a7"; // armv7-a
-+    default:
-+      return "armv5";
-+    }
-   default:
-     break;
-   }
diff --git a/debian/patches/series b/debian/patches/series
index dcad68f3..9fbab5b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -147,4 +147,3 @@ bolt-disable-emit-relocs.patch
 link-grpc.diff
 libclang-major-version-only.diff
 D148945-revert.diff
-arm32-defaults.diff