Merge version 4.8.1-1+rpi1 and 4.8.1-1+deb9u1 to produce 4.8.1-1+rpi1+deb9u1

diff --cc debian/changelog
index 580fd46dcdbbdcdb2e53d62fe95a0a2c7f3a4e92,5b5896f5cf7d4d9d3b85dcbbe71b68fec01faf42..cef38a046533ff887543e228133962545b777f76
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- xen (4.8.1-1+rpi1) stretch-staging; urgency=medium
++xen (4.8.1-1+rpi1+deb9u1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 4.4.1-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2015 15:43:16 +0000]
 +  * replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6
 +  
 +  [changes introduced in 4.6.0-1+rpi1 by Peter Michael Green]
 +  * Use kernel 3.18 for now as I haven't dealt with 4.x yet.
 +
 +  [changes introduced in 4.8.0-1+rpi1 by Peter Micheal Green]
 +  * Add build-depends on ghostscript.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Apr 2017 20:03:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 04 May 2017 21:08:45 +0000
++
+ xen (4.8.1-1+deb9u1) unstable; urgency=medium
+ 
+   * Security fixes for XSA-213 (Closes:#861659) and XSA-214
+     (Closes:#861660).  (Xen 4.7 and later is not affected by XSA-215.)
+ 
+  -- Ian Jackson <ian.jackson@eu.citrix.com>  Tue, 02 May 2017 12:19:57 +0100
  
  xen (4.8.1-1) unstable; urgency=high
  

diff --cc debian/patches/series
index 3ac225f5670b47d4398152bd813800273e4c552c,c7b3e0fcb8c322253d4def0829526c88de258bfd..e7b2191190002b24f30e9b1751b544b53d56109e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -26,4 -26,5 +26,6 @@@ tools-xenmon-install.dif
  tools-xenstore-compatibility.diff
  ubuntu-tools-libs-abiname.diff
  toolstestsx86_emulator-pass--no-pie--fno
+ multicall-deal-with-early-exit-condition
+ x86-discard-type-information-when-steali
 +armv6.diff