Merge version 4.11.4+57-g41a822c392-2+rpi1 and 4.11.4+99-g8bce4698f6-1 to produce...

diff --cc debian/changelog
index 4d433bbe3e53aa872a33c67512b51f75657481df,3079d493919c5349f3e13444cf8313f5e3ef3e50..2a75c2d6db8d08790668a391e9c260c5f62da071
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,20 +1,33 @@@
- xen (4.11.4+57-g41a822c392-2+rpi1) buster-staging; urgency=medium
++xen (4.11.4+99-g8bce4698f6-1+rpi1) buster-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, 18 Dec 2020 04:56:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Apr 2021 02:50:14 +0000
++
+ xen (4.11.4+99-g8bce4698f6-1) buster-security; urgency=high
+ 
+   * Update to new upstream version 4.11.4+99-g8bce4698f6, which also contains
+     security fixes for the following issues:
+     - arm: The cache may not be cleaned for newly allocated scrubbed pages
+       XSA-364 CVE-2021-26933
+     - missed flush in XSA-321 backport
+       XSA-366 CVE-2021-27379
+   * Note that the following XSA are not listed, because...
+     - XSA-360 and XSA-368 only apply to Xen 4.12 and newer.
+     - XSA-361, XSA-362, XSA-363, XSA-365, XSA-367 and XSA-369 have patches for
+       the Linux kernel.
+   * Drop separate patches for XSAs up to 359 that are now included in the
+     upstream stable branch.
+   * Fix cosmetics wrt. XSA/CVE text formatting in the previous entry.
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Wed, 24 Mar 2021 19:52:15 +0100
  
  xen (4.11.4+57-g41a822c392-2) buster-security; urgency=high
  

diff --cc debian/patches/series
index 5266e76eb5554adf83f3900dd990b7180efcb0ce,95cfd8de1f2af4be5aa7ce8534d5f007700c5926..07113c359ed0d4331286d34afb983127114ac264
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -47,31 -47,3 +47,4 @@@ prefix-abiname/tools-libfsimage-prefix.
  0047-pygrub-Set-sys.path.patch
  0048-pygrub-Specify-rpath-LIBEXEC_LIB-when-building-fsima.patch
  0049-tools-xl-bash-completion-also-complete-xen.patch
- 0050-tools-ocaml-xenstored-do-permission-checks-on-xensto.patch
- 0051-tools-xenstore-allow-removing-child-of-a-node-exceed.patch
- 0052-tools-xenstore-ignore-transaction-id-for-un-watch.patch
- 0053-tools-xenstore-fix-node-accounting-after-failed-node.patch
- 0054-tools-xenstore-simplify-and-rename-check_event_node.patch
- 0055-tools-xenstore-check-privilege-for-XS_IS_DOMAIN_INTR.patch
- 0056-tools-xenstore-rework-node-removal.patch
- 0057-tools-xenstore-fire-watches-only-when-removing-a-spe.patch
- 0058-tools-xenstore-introduce-node_perms-structure.patch
- 0059-tools-xenstore-allow-special-watches-for-privileged-.patch
- 0060-tools-xenstore-avoid-watch-events-for-nodes-without-.patch
- 0061-tools-ocaml-xenstored-ignore-transaction-id-for-un-w.patch
- 0062-tools-ocaml-xenstored-check-privilege-for-XS_IS_DOMA.patch
- 0063-tools-ocaml-xenstored-unify-watch-firing.patch
- 0064-tools-ocaml-xenstored-introduce-permissions-for-spec.patch
- 0065-tools-ocaml-xenstored-avoid-watch-events-for-nodes-w.patch
- 0066-tools-ocaml-xenstored-add-xenstored.conf-flag-to-tur.patch
- 0067-tools-xenstore-revoke-access-rights-for-removed-doma.patch
- 0068-tools-ocaml-xenstored-clean-up-permissions-for-dead-.patch
- 0069-tools-ocaml-xenstored-Fix-path-length-validation.patch
- 0070-tools-xenstore-drop-watch-event-messages-exceeding-m.patch
- 0071-tools-xenstore-Preserve-bad-client-until-they-are-de.patch
- 0072-tools-ocaml-xenstored-delete-watch-from-trie-too-whe.patch
- 0073-tools-ocaml-xenstored-only-Dom0-can-change-node-owne.patch
- 0074-x86-avoid-calling-svm-vmx-_do_resume.patch
- 0075-evtchn-FIFO-re-order-and-synchronize-with-map_contro.patch
- 0076-evtchn-FIFO-add-2nd-smp_rmb-to-evtchn_fifo_word_from.patch
 +armv6.diff

diff --cc tools/libxc/include/xenctrl.h
Simple merge