Manual merge of version 4.17.0-1+rpi1 and 4.17.1+2-gb773c48e36-1 to produce 4.17...

diff --cc debian/changelog
index 006c55908d39932e9efd399b9ceadffd73ae8f01,5d6375ab198c73e847ffd108a91307071447a6b8..4eb4066d1a1b40b7527d9dbcd9c59d44d6cef974
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,87 +1,97 @@@
- xen (4.17.0-1+rpi1) bookworm-staging; urgency=medium
++xen (4.17.1+2-gb773c48e36-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.
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 28 Jul 2023 00:24:52 +0000
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Jan 2023 05:43:22 +0000
+ xen (4.17.1+2-gb773c48e36-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.17.1+2-gb773c48e36, which also contains
+     security fixes for the following issues:
+     - x86 shadow paging arbitrary pointer dereference
+       XSA-430 CVE-2022-42335
+       (Closes: #1034842)
+     - Mishandling of guest SSBD selection on AMD hardware
+       XSA-431 CVE-2022-42336
+ 
+  -- Maximilian Engelhardt <maxi@daemonizer.de>  Thu, 18 May 2023 21:26:30 +0200
+ 
+ xen (4.17.0+74-g3eac216e6e-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.17.0+74-g3eac216e6e, which also contains
+     security fixes for the following issues: (Closes: #1033297)
+     - x86 shadow plus log-dirty mode use-after-free
+       XSA-427 CVE-2022-42332
+     - x86/HVM pinned cache attributes mis-handling
+       XSA-428 CVE-2022-42333 CVE-2022-42334
+     - x86: speculative vulnerability in 32bit SYSCALL path
+       XSA-429 CVE-2022-42331
+ 
+  -- Maximilian Engelhardt <maxi@daemonizer.de>  Thu, 23 Mar 2023 22:22:48 +0100
+ 
+ xen (4.17.0+46-gaaf74a532c-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.17.0+46-gaaf74a532c, which also contains
+     security fixes for the following issues:
+      - x86: Cross-Thread Return Address Predictions
+        XSA-426 CVE-2022-27672
+        (Closes: #1031567)
+   * debian/shuffle-boot-files: fix typo
+   * debian/changelog: Fix bug number typo.
+   * debian/changelog: Remove duplicate 'Note that'
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Fri, 24 Feb 2023 18:06:42 +0100
+ 
+ xen (4.17.0+24-g2f8851c37f-2) unstable; urgency=medium
+ 
+   * Upload to unstable now, since we got message from the OCaml team that we
+     are not bothering them while they're doing their stack rebuild.
+ 
+  -- Hans van Kranenburg <hans@knorrie.org>  Mon, 06 Feb 2023 14:27:40 +0100
+ 
+ xen (4.17.0+24-g2f8851c37f-2~exp1) experimental; urgency=medium
+ 
+   * Upload to experimental NEW to avoid disrupting ocaml transition.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 Feb 2023 13:07:44 +0000
+ 
+ xen (4.17.0+24-g2f8851c37f-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.17.0+24-g2f8851c37f, which also contains
+     security fixes for the following issues:
+      - Guests can cause Xenstore crash via soft reset
+        XSA-425 CVE-2022-42330
+        (Closes: #1029830)
+   * d/control: update build dependency to libext2fs-dev
+   * debian: switch to debhelper compat version 13
+   * d/rules: 'dh_missing --fail-missing' is default in dh compat 13
+   * d/control: change Depends from lsb-base to sysvinit-utils
+   * debian: split debug files out of xen-hypervisor-V-F and xen-utils-V. This
+     means that we now start to ship additional separate *-dbg packages.
+   * d/xen-utils-common.xendomains.default: remove XENDOMAINS_SYSRQ
+   * d/xen-utils-common.xendomains.default: adjust to upstream template
+   * debian: remove old leftovers from config file handling
+   * d/control: set Rules-Requires-Root: no
+   * d/xen-hypervisor-common.lintian-overrides: ignore false positive about
+     'debian-news-entry-has-unknown-version'
+   * d/rules: use pkg-info.mk and do Maintainer parsing in d/rules
+   * Update patch 'Display Debian package version in hypervisor log' to use
+     the DEB_VERSION and DEB_MAINTAINER variables that are now available.
+ 
+   [ Diederik de Haas ]
+   * d/control: Drop markdown B-D for documentation
+   * ci: Update reason why arm64 crossbuild is disabled
+ 
+   [ Hans van Kranenburg ]
+   * d/copyright: rewrite the file from scratch and make it up to date
+   * d/shuffle-boot-files: Add a note about d/not-installed
+   * d/shuffle-boot-files: Also handle debug files (Closes: #995233)
+ 
+  -- Maximilian Engelhardt <maxi@daemonizer.de>  Wed, 01 Feb 2023 21:52:15 +0100
  
  xen (4.17.0-1) unstable; urgency=medium