Merge version 4.8.3+comet2+shim4.10.0+comet3-1+deb9u4.1+rpi1 and 4.8.3+comet2+shim4...

diff --cc debian/changelog
index 32ada6db87e2a2b87848575fd291dc13314ab8da,c2f1141e3f2d088583a4a1718fbfcd3e616b8545..fd7500257f62640cf065175e709500ab551fb0df
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,17 +1,30 @@@
- xen (4.8.3+comet2+shim4.10.0+comet3-1+deb9u4.1+rpi1) stretch-staging; urgency=medium
++xen (4.8.3+comet2+shim4.10.0+comet3-1+deb9u5+rpi1) 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>  Thu, 15 Feb 2018 00:15:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 12 Mar 2018 14:09:24 +0000
++
+ xen (4.8.3+comet2+shim4.10.0+comet3-1+deb9u5) stretch-security; urgency=high
+ 
+   * Security fixes from upstream XSAs:
+        XSA-252 CVE-2018-7540
+        XSA-255 CVE-2018-7541
+        XSA-256 CVE-2018-7542
+     The upstream BTI changes from XSA-254 (Spectre v2 mitigation)
+     are *not* included.  They are currently failing in upstream CI.
+   * init scripts: Do not kill per-domain qemu processes.  Closes:#879751.
+   * Install Meltdown READMEs on all architectures.  Closes:#890488.
+   * Ship xen-diag (by cherry-picking the appropriate commits from
+     upstream).  This can help with diagnosis of #880554.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 02 Mar 2018 16:07:18 +0000
  
  xen (4.8.3+comet2+shim4.10.0+comet3-1+deb9u4.1) stretch-security; urgency=high
  

diff --cc debian/patches/series
index dc89cd4f9eb0a604d0c30840181a29130792623f,d59aa661fd1e05a8954a9bc065e8483ff7015cc6..5656997be10fcfd5529230dbb4d40416d494bba4
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -28,4 -28,9 +28,10 @@@ ubuntu-tools-libs-abiname.dif
  toolstestsx86_emulator-pass--no-pie--fno.patch
  copy-readme.pti-and-readme.comet-from-th.patch
  tools-fix-arm-build-after-bdf693ee61b48.patch
+ tools-utility-to-dump-guest-grant-table-.patch
+ gitignore-add-toolsmiscxen-diag-to-.giti.patch
+ memory-dont-implicitly-unpin-for-decreas.patch
+ gnttabarm-dont-corrupt-shared-gfn-array.patch
+ gnttab-dont-blindly-free-status-pages-up.patch
+ x86hvm-disallow-the-creation-of-hvm-doma.patch
 +armv6.diff