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

diff --cc debian/changelog
index a38309722726c450ccd8c798b99fdddec5876335,2553b1e926e857fb19abdcfddacf50648b8ce4d8..a7b9a90045158945359122d72528fef327287ad5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- volk (2.2.1-1+rpi1) bullseye-staging; urgency=medium
++volk (2.2.1-2+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>  Thu, 27 Feb 2020 15:04:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Apr 2020 18:19:28 +0000
++
+ volk (2.2.1-2) unstable; urgency=medium
+ 
+   * update to v2.2.1-11-gfaf230e
+   * cmake: Remove the ORC from the VOLK public link interface
+   * Fix the broken index max kernels
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Fri, 27 Mar 2020 21:48:10 -0400
  
  volk (2.2.1-1) unstable; urgency=high
  

diff --cc debian/patches/series
Simple merge

diff --cc lib/CMakeLists.txt
Simple merge