Merge version 4.8.1-1+rpi1+deb9u3 and 4.8.2+xsa245-0+deb9u1 to produce 4.8.2+xsa245...

diff --cc debian/changelog
index 48f4ad1eed4495c2ca368bf90ff00b9129205e4c,6f85ded7d5b547155d74fd1f858f307cf0b69fe3..9a40b7f3b2bac5acbd8b8413709244d32fd32dec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,30 +1,43 @@@
- xen (4.8.1-1+rpi1+deb9u3) stretch-staging; urgency=medium
++xen (4.8.2+xsa245-0+deb9u1+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, 14 Sep 2017 17:51:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Dec 2017 13:53:45 +0000
++
+ xen (4.8.2+xsa245-0+deb9u1) stretch-security; urgency=high
+ 
+   * Update to upstream stable 4.8 branch, which is currently at Xen 4.8.2
+     plus a number of bugfixes and security fixes.
+     Result is that we now include security fixes for:
+        XSA-231 CVE-2017-14316
+        XSA-232 CVE-2017-14318
+        XSA-233 CVE-2017-14317
+        XSA-234 CVE-2017-14319
+        (235 already included in 4.8.1-1+deb9u3)
+        XSA-236 CVE-2017-15597
+        XSA-237 CVE-2017-15590
+        XSA-238 (no CVE yet)
+        XSA-239 CVE-2017-15589
+        XSA-240 CVE-2017-15595
+        XSA-241 CVE-2017-15588
+        XSA-242 CVE-2017-15593
+        XSA-243 CVE-2017-15592
+        XSA-244 CVE-2017-15594
+        XSA-245 (no CVE yet)
+     and a number of upstream functionality fixes, which are not easily
+     disentangled from the security fixes.
+   * Apply two more security fixes:
+        XSA-246 (no CVE yet)
+        XSA-247 (no CVE yet)
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 25 Nov 2017 11:26:37 +0000
  
  xen (4.8.1-1+deb9u3) stretch-security; urgency=high
  

diff --cc debian/patches/series
index f1bdd5ce3dc8b85062040bd0886843cb4f240fb9,373d7f06e1679d9bdb801f7136429812d68b09f7..96b319f579feec40cc266788af302babbe5d1b78
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -25,28 -25,7 +25,8 @@@ tools-include-install.dif
  tools-xenmon-install.diff
  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
- x86mm-disallow-page-stealing-from-hvm-do
- gnttab-fix-unmap-pin-accounting-race
- gnttab-avoid-potential-double-put-of-map
- gnttab-correct-maptrack-table-accesses
- x86shadow-hold-references-for-the-durati
- x86-avoid-leaking-pkru-and-bnd-between-v
- evtchn-avoid-null-derefs
- xenmemory-fix-return-value-handing-of-gu
- guest_physmap_remove_page-needs-its-retu
- arm-vgic-dont-update-the-lr-when-the-irq
- gnttab-fix-handling-of-dev_bus_addr-duri
- gnttab-never-create-host-mapping-unless-
- gnttab-correct-logic-to-get-page-referen
- gnttab-__gnttab_unmap_common_complete-is
- xenarm-vgic-sanitize-target-mask-used-to
- gnttab-dont-use-possibly-unbounded-tail-
- gnttab-fix-transitive-grant-handling
- x86grant-disallow-misaligned-ptes
- gnttab-split-maptrack-lock-to-make-it-fu
- gnttab-correct-pin-status-fixup-for-copy
- armmm-release-grant-lock-on-xenmem_add_t
+ toolstestsx86_emulator-pass--no-pie--fno.patch
+ x86pod-prevent-infinite-loop-when-shatte.patch
+ p2m-always-check-to-see-if-removing-a-p2.patch
+ p2m-check-return-value-of-p2m_set_entry-.patch
 +armv6.diff