From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 10 Aug 2021 17:09:40 +0000 (+0100)
Subject: Merge version 4.14.1+11-gb0b734a8b3-1+rpi1 and 4.14.2+25-gb6a8c4f72d-2 to produce... 
X-Git-Tag: archive/raspbian/4.14.2+25-gb6a8c4f72d-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc3785dd02f84fb49141d896415ed4d287f05957;p=xen.git

Merge version 4.14.1+11-gb0b734a8b3-1+rpi1 and 4.14.2+25-gb6a8c4f72d-2 to produce 4.14.2+25-gb6a8c4f72d-2+rpi1
---

bc3785dd02f84fb49141d896415ed4d287f05957
diff --cc debian/changelog
index 8a850eec33,4b83efda54..4115a113c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,31 +1,44 @@@
- xen (4.14.1+11-gb0b734a8b3-1+rpi1) bullseye-staging; urgency=medium
++xen (4.14.2+25-gb6a8c4f72d-2+rpi1) bullseye-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.11.1+26-g87f51bf366-3+rpi1 by Peter Michael Green]
 +  * Do not fail on files that are not installed.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 12 Mar 2021 01:52:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 10 Aug 2021 17:09:40 +0000
++
+ xen (4.14.2+25-gb6a8c4f72d-2) unstable; urgency=medium
+ 
+   * Add README.Debian.security containing a note about the end of upstream
+     security support for Xen 4.14. Install it into xen-hypervisor-common.
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Fri, 30 Jul 2021 16:57:52 +0200
+ 
+ xen (4.14.2+25-gb6a8c4f72d-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.14.2+25-gb6a8c4f72d, which also contains
+     security fixes for the following issues:
+     - HVM soft-reset crashes toolstack
+       XSA-368 CVE-2021-28687
+     - xen/arm: Boot modules are not scrubbed
+       XSA-372 CVE-2021-28693
+     - inappropriate x86 IOMMU timeout detection / handling
+       XSA-373 CVE-2021-28692
+     - Speculative Code Store Bypass
+       XSA-375 CVE-2021-0089 CVE-2021-26313
+     - x86: TSX Async Abort protections not restored after S3
+       XSA-377 CVE-2021-28690
+   * Note that the following XSA are not listed, because...
+     - XSA-370 does not contain code changes.
+     - XSA-365, XSA-367, XSA-369, XSA-371 and XSA-374 have patches for the
+       Linux kernel.
+     - XSA-366 only applies to Xen 4.11.
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Sun, 11 Jul 2021 14:29:13 +0200
  
  xen (4.14.1+11-gb0b734a8b3-1) unstable; urgency=medium