Merge version 4.16.0+51-g0941d6cb-1+rpi1 and 4.16.1-1 to produce 4.16.1-1+rpi1

diff --cc debian/changelog
index 16795ad56c353dcce054bee50de5f74e8434b571,5358c0eb0060ea3238903ead675b62ee18c60ee0..c7d796182f5dc4e011221985e2e196c48f99e020
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,46 +1,59 @@@
- xen (4.16.0+51-g0941d6cb-1+rpi1) bookworm-staging; urgency=medium
++xen (4.16.1-1+rpi1) bookworm-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>  Thu, 21 Apr 2022 07:22:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 May 2022 09:11:27 +0000
++
+ xen (4.16.1-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.16.1, which also contains security fixes
+     for the following issues:
+     - Racy interactions between dirty vram tracking and paging log dirty
+       hypercalls
+       XSA-397 CVE-2022-26356
+     - Multiple speculative security issues
+       XSA-398 (no CVE yet)
+     - race in VT-d domain ID cleanup
+       XSA-399 CVE-2022-26357
+     - IOMMU: RMRR (VT-d) and unity map (AMD-Vi) handling issues
+       XSA-400 CVE-2022-26358 CVE-2022-26359 CVE-2022-26360 CVE-2022-26361
+   * Note that the following XSA are not listed, because...
+     - XSA-396 has patches for the Linux kernel.
+   * Don't ship NEWS in libxen* packages. Instead, only ship relevant NEWS
+     items for actual hypervisor and/or utils packages they belong to.
+     (Closes: #962267)
+   * d/control: make xen-hypervisor-common arch specific, just like
+     xen-utils-common.
+   * d/control: stop recommending qemu-system-x86 on arm, because qemu is not
+     being built with xen support on arm...
+   * Add a patch for tools/libs/light/Makefile which prevents build.o and
+     build.opic to be rebuilt unneededly during the package install phase,
+     causing a FTBFS because it triggers the use of ccache, which is not
+     allowed in the install phase of building the Debian packages.
+ 
+   Improvements related to Qemu integration:  [Michael Tokarev]
+   * d/xen-utils-common.xen.init: properly disable qemu monitor/serial/parallel
+     devices for qemu started at boot.
+   * debian: switch from recommending qemu-system-x86 to qemu-system-xen and
+     mention this change in the NEWS file.
+   * Add patch "give meaningful error message if qemu device model is
+     unavailable" to give a useful error message only in case the domU needs
+     the qemu device model which is not installed, instead of giving a warning
+     about missing qemu even if it is not used by this domain.
+ 
+   Documentation, grammar and spelling fixes and improvements:
+   * d/control: drop obsolete paragraph about separate xen linux kernel package
+   * d/control: Harmonize the capitalization of the 'Xen' word  [Diederik de Haas]
+   * d/control: Improve spelling and grammar  [Diederik de Haas]`
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Mon, 09 May 2022 22:29:23 +0200
  
  xen (4.16.0+51-g0941d6cb-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 671ef4e7b13eec8239ff6bd0a5f8bd74ac4b323d,49ad46cd456efb577dc4e41edbd3bf323b43d597..dd51d74c2d35c5badf47c31f56494f124cb5d7f0
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -20,4 -20,5 +20,6 @@@ misc/tools-pygrub-remove-static-solaris
  0020-tools-don-t-build-ship-xenmon.patch
  0021-docs-set-date-to-SOURCE_DATE_EPOCH-if-available.patch
  0022-xen-arch-x86-make-objdump-output-user-locale-agnosti.patch
+ 0023-give-meaningful-error-message-if-qemu-device-model-i.patch
+ 0024-libxl-Fix-unneededly-rebuilding-build.o-pic.patch
 +auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821

diff --cc debian/rules
Simple merge