Merge version 2.2.0-2+rpi1 and 2.2.1-1 to produce 2.2.1-1+rpi1

diff --cc debian/changelog
index 5599465561b2787fc4688f6893330a7c8e35dea2,4ee58c20d5ca145d8ce9dc9bd285dcd4ed1e6eda..a38309722726c450ccd8c798b99fdddec5876335
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,30 @@@
- volk (2.2.0-2+rpi1) bullseye-staging; urgency=medium
++volk (2.2.1-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
 +  * Disable neon.
 +
 +  [changes introduced in 2.1.0-2+rpi1 by Peter Michael Green]
 +  * Add bulid-depends-indep on texlive-latex-extra.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Feb 2020 03:07:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Feb 2020 15:04:59 +0000
++
+ volk (2.2.1-1) unstable; urgency=high
+ 
+   * New upstream bugfix release
+     reason for high urgency:
+     - Fix loop bound in AVX rotator (only one fixed in 2.2.0-3)
+     - Fix out-of-bounds read in AVX2 square dist kernel
+     - Fix length checks in AVX2 index max kernels
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Mon, 24 Feb 2020 18:08:05 -0500
+ 
+ volk (2.2.0-3) unstable; urgency=high
+ 
+   * Update to v2.2.0-6-g5701f8f
+     reason for high urgency:
+     - Fix loop bound in AVX rotator
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 23 Feb 2020 23:49:18 -0500
  
  volk (2.2.0-2) unstable; urgency=medium
  

diff --cc debian/control
index d867767358beb213364e0fa7cd9bab1bc42d3138,d53a4a23933e16972429d3938ce7a7103ccec0cc..e97da89e4c23124074dbdda7ec93d881d6e55e1e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -8,8 -9,8 +9,8 @@@ Build-Depends: cmake
                 liborc-0.4-dev,
               python3-dev,
               python3-mako
 -Build-Depends-Indep: doxygen
 +Build-Depends-Indep: doxygen, texlive-latex-extra,
- Standards-Version: 4.4.0
+ Standards-Version: 4.5.0
  Homepage: http://libvolk.org
  Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk
  Vcs-Git: https://salsa.debian.org/bottoms/pkg-volk.git

diff --cc debian/patches/series
Simple merge