Merge version 4.16.2+90-g0d39a6d1ae-1+rpi1 and 4.17.0-1 to produce 4.17.0-1+rpi1

diff --cc debian/changelog
index 5363757c18ea1ac925f463bd6447b42350566ff8,a899a618e8c8dde25fbea7942c5126bd77551b3f..006c55908d39932e9efd399b9ceadffd73ae8f01
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,25 +1,38 @@@
- xen (4.16.2+90-g0d39a6d1ae-1+rpi1) bookworm-staging; urgency=medium
++xen (4.17.0-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>  Tue, 22 Nov 2022 09:16:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Jan 2023 05:43:22 +0000
++
+ xen (4.17.0-1) unstable; urgency=medium
+ 
+   * Update to new upstream version 4.17.0.
+   * No new security fixes are included.
+   * Note that the following XSA are not listed, because...
+     - XSA-423 and XSA-424 have patches for the Linux kernel.
+   * debian/control: update Standards-Version to 4.6.2
+   * debian/control: update Build-Depends for ocaml
+ 
+  -- Maximilian Engelhardt <maxi@daemonizer.de>  Wed, 21 Dec 2022 22:34:51 +0100
+ 
+ xen (4.17.0~rc4-1~exp1) experimental; urgency=medium
+ 
+   Significant changes:
+   * Update to new upstream version 4.17.0~rc4.
+ 
+   Changes related to upgrading to Xen 4.17:
+   * debian/control: adjust to 4.17
+   * Drop "libxl: Fix unneededly rebuilding build.o(pic)", no longer needed
+   * Refresh remaining patches if needed
+ 
+  -- Maximilian Engelhardt <maxi@daemonizer.de>  Wed, 07 Dec 2022 21:01:04 +0100
  
  xen (4.16.2+90-g0d39a6d1ae-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index dd51d74c2d35c5badf47c31f56494f124cb5d7f0,8643102a2cc72982d4bd113218ef3f983fed5aad..e9f303fac81ba30d77f142af44b7d809ef012d60
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -19,7 -19,5 +19,6 @@@ misc/tools-pygrub-remove-static-solaris
  0019-tools-xl-bash-completion-also-complete-xen.patch
  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
+ 0022-give-meaningful-error-message-if-qemu-device-model-i.patch
+ 0023-xen-arch-x86-make-objdump-output-user-locale-agnosti.patch
 +auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821

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