From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 28 Jun 2018 01:20:58 +0000 (+0100)
Subject: Merge version 4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u8+rpi1 and 4.8.3+xsa267+shim4... 
X-Git-Tag: archive/raspbian/4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c3ee9bcbd3db35fd58f32222f7cfd043bb472152;p=xen.git

Merge version 4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u8+rpi1 and 4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9 to produce 4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9+rpi1
---

c3ee9bcbd3db35fd58f32222f7cfd043bb472152
diff --cc debian/changelog
index 763a95c983,ab400b5db2..123aa52cc9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,24 @@@
- xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u8+rpi1) stretch-staging; urgency=medium
++xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9+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>  Fri, 22 Jun 2018 03:45:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Jun 2018 01:20:58 +0000
++
+ xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u9) stretch-security; urgency=high
+ 
+   * Security upload [thanks to Wolodja Wentland]:
+        XSA-264 (no CVE yet)
+        XSA-265 (no CVE yet)
+        XSA-266 (no CVE yet)
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 22 Jun 2018 16:38:39 +0100
  
  xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u8) stretch-security; urgency=high
  
diff --cc debian/patches/series
index 29c7314781,261ebd0a0f..b5acc79d55
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -29,4 -29,7 +29,8 @@@ 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