Manual merge of version 2.1-2+rpi1 and 2.2-1 to produce 2.2-1+rpi1

Drop movw/movt change, upstream no longer uses those instructions.

diff --cc avcall/avcall-armhf-macro.S
Simple merge

diff --cc callback/vacall_r/vacall-armhf-macro.S
Simple merge

diff --cc debian/changelog
index 35d76694b2a5bce898b798749d85afedc6c5ec0a,8b5694463d23c4edf5ecbe1c2f578c52ca411dc2..91eecde6f569c3351c164d76bf4ca24fb9b6c3bf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,21 +1,29 @@@
- ffcall (2.1-2+rpi1) buster-staging; urgency=medium
++ffcall (2.2-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Dec 2017 01:23:49 +0000]
-   * Replace movw/movt with ldr psuedo instruction.
 +  * Mark binaries as armv6 not armv7
 +  * Disable testsuite, it fails on some of our buildboxes.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Apr 2018 20:44:51 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Sep 2019 18:09:25 +0000
++
+ ffcall (2.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+     + fixes hppa support (Closes: #457930, #883043)
+   * Drop mips-fpxx.patch, no longer needed
+   * mips-r6.patch: refresh patch, and incorporate fix for jaql instruction.
+     Thanks to Luyou Peng (Closes: #925129)
+   * cross.patch: new patch, fixes FTCBFS. Thanks to Helmut Grohne
+     (Closes: #909125)
+   * d/copyright: reflect upstream changes
+   * Add Build-Depends-Package field in symbols files
+   * Add Rules-Requires-Root: no
+   * Bump S-V to 4.4.0
+   * Bump to debhelper compat level 12
+   * Re-export upstream signing key without extra signatures.
+   * Set upstream metadata fields: Bug-Submit.
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 28 Aug 2019 21:39:51 +0200
  
  ffcall (2.1-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index d2c7d804edce7091c55ca18bd58f149546208ce0,fe3a8a2d2fed2477a7e2e2d67d21cc5040bd4715..8e3180f3ee79f3f49f6f97df081125a5e242e9e2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,2 +1,3 @@@
  mips-r6.patch
- mips-fpxx.patch
+ cross.patch
 +raspbian.patch

diff --cc vacall/vacall-armhf-macro.S
Simple merge