Merge version 1:9.0.1-16+rpi1 and 1:9.0.1-16.1 to produce 1:9.0.1-16.1+rpi1

diff --cc debian/changelog
index e308f2279953586e7af5275cadc9f0a142d866c6,5e356fcea12637cf7e76cc8bb89a44c11b0ae1f4..0d323e5388a3f54cb124feb2a363cc9565f6b8f8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,11 +1,49 @@@
- llvm-toolchain-9 (1:9.0.1-16+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-9 (1:9.0.1-16.1+rpi1) bullseye-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jan 2021 16:53:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Aug 2021 04:32:47 +0000
++
+ llvm-toolchain-9 (1:9.0.1-16.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * clang-9: Drop Recommends: libomp-9-dev which is not co-installable with
+     libomp-11-dev (and libomp-dev) for smoother upgrades of libomp-dev from
+     buster to bullseye.  (Closes: #990452)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Sat, 10 Jul 2021 23:52:37 +0200
  
  llvm-toolchain-9 (1:9.0.1-16) unstable; urgency=medium
  

diff --cc debian/control
Simple merge