Merge version 4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9+rpi1 and 4.8.4+xsa273+shim4...

diff --cc debian/changelog
index 123aa52cc9fa0de56dffd1fb487eb72ea39e2a98,d852bdc149d8300c7d163b69ec34ef66893a3aaa..135e384ed1947a770418633787c5c70dd3bff145
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,28 @@@
- xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9+rpi1) stretch-staging; urgency=medium
++xen (4.8.4+xsa273+shim4.10.1+xsa273-1+deb9u10+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, 28 Jun 2018 01:20:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Aug 2018 23:20:32 +0000
++
+ xen (4.8.4+xsa273+shim4.10.1+xsa273-1+deb9u10) stretch-security; urgency=medium
+ 
+   * Update to new upstream version 4.8.4+xsa273+shim4.10.1+xsa273.
+       XSA-273 (CVE-2018-3620,CVE-2018-3646)
+       XSA-272 (no CVE yet)
+       XSA-269 (no CVE yet)
+       XSA-268 (no CVE yet)
+ 
+     This version is, again, a combination of staging-4.8 and staging-4.10
+     for Xen and shim respectively as in previous versions.
+ 
+  -- Wolodja Wentland <debian@babilen5.org>  Wed, 15 Aug 2018 23:51:28 +0100
  
  xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9) stretch-security; urgency=high
  

diff --cc debian/patches/series
index b5acc79d55ea88ef18c6f9004fc1f94ceca5bd9d,4181bd7551b2f1e72c4b7a5225ca55c10dc83703..29c7314781f6620039861e718204dce2b799827e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -29,8 -29,3 +29,4 @@@ ubuntu-tools-libs-abiname.dif
  0029-Copy-README.pti-and-README.comet-from-the-XSA-254-ad.patch
  0030-tools-utility-to-dump-guest-grant-table-info.patch
  0031-gitignore-add-tools-misc-xen-diag-to-.gitignore.patch
- x86mm-dont-bypass-preemption-checks.patch
- x86-refine-checks-in-db-handler-for-faul.patch
- libxl-qemu_disk_scsi_drive_string-break-.patch
- libxl-restore-passing-readonly=-to-qemu-.patch
 +armv6.diff