Merge version 1:12.0.1-16+rpi1 and 1:12.0.1-17 to produce 1:12.0.1-17+rpi1

diff --cc debian/changelog
index 8db31adb509bdc00933e9bafa84494701d694cf8,2078d2a25b32dee6c55fd52429e942d98430eb17..f8d11c0e602b5e3f22a1acc58c0ea6eeab0ac97d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,8 +1,49 @@@
- llvm-toolchain-12 (1:12.0.1-16+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-12 (1:12.0.1-17+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 23 Jan 2021 14:24:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Dec 2021 16:04:28 +0000
++
+ llvm-toolchain-12 (1:12.0.1-17) unstable; urgency=medium
+ 
+   * Rebuild to workaround the coinstallability issue (Closes: #996858)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 30 Nov 2021 19:32:51 +0100
  
  llvm-toolchain-12 (1:12.0.1-16) unstable; urgency=medium