Merge version 4.11.3+24-g14b62ab3e5-1+rpi1 and 4.11.4-1 to produce 4.11.4-1+rpi1

diff --cc debian/changelog
index d49000a1e5834e8b25834613e5cf5358bb6aad7d,d4434b458e4d3b48161d4f82ce32a22d5644b597..2aff6bb346419dd5410f984831669f16e1cd1170
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,27 +1,40 @@@
- xen (4.11.3+24-g14b62ab3e5-1+rpi1) bullseye-staging; urgency=medium
++xen (4.11.4-1+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>  Sat, 11 Jan 2020 10:49:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jun 2020 23:20:39 +0000
++
+ xen (4.11.4-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.11.4, which also contains security fixes
+     for the following issues:
+     - arm: a CPU may speculate past the ERET instruction
+       XSA-312 (no CVE yet)
+     - multiple xenoprof issues
+       XSA-313 CVE-2020-11740 CVE-2020-11741
+     - Missing memory barriers in read-write unlock paths
+       XSA-314 CVE-2020-11739
+     - Bad error path in GNTTABOP_map_grant
+       XSA-316 CVE-2020-11743
+     - Bad continuation handling in GNTTABOP_copy
+       XSA-318 CVE-2020-11742
+   * xen-utils and xen-utils-common maint scripts: Replace the previous fix in
+     the xen init script with a better fix in the xen-utils package instead, to
+     prevent calling the init script stop action (resulting in a disappeared
+     xenconsoled) when removing a xen-utils package that belongs to a previous
+     (not currently runing) Xen version. Also prevent the xen-utils-common
+     package from inadvertently calling stop and start actions because
+     dh_installinit would add code for that. (Closes: #932759)
+   * debian/NEWS: Mention fixing #932759 and how to deal with the bug
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Tue, 26 May 2020 13:33:17 +0200
  
  xen (4.11.3+24-g14b62ab3e5-1) unstable; urgency=high
  

diff --cc debian/rules
Simple merge