Merge version 247.9-1+rpi1 and 247.9-4 to produce 247.9-4+rpi1

diff --cc debian/changelog
index 4afd05fca07114ae33546493ff444f9057acd697,7ea8358ea458a4c9a32152ee5a98604ccc766a53..0b31fbc8d561440e4c273cb53d9b2083106771e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,45 +1,59 @@@
- systemd (247.9-1+rpi1) bookworm-staging; urgency=medium
++systemd (247.9-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 239-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 20:22:45 +0000]
 +  * Disable testsuite, it fails on some of our buildboxes (probablly because of
 +    old kernels).
 +  * Add breaks on raspi-copies-and-fills, it doesn't seem to get on with
 +    this version of systemd/udev.
 +
 +  [changes brought forward from 241-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 02 Apr 2019 19:29:26 +0000]
 +  * Bump "breaks" on raspi-copies-and-fills to << 0.12
 +    (raspi-copies-and-fills was reverted by the raspberry pi foundation)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Aug 2021 17:32:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Oct 2021 19:42:06 +0000
++
+ systemd (247.9-4) unstable; urgency=medium
+ 
+   * Revert "tests/udev-test.pl: add multiple device test"
+     Follow-up to make sure the udev autopkgtest passes successfully again
+     after reverting the multipath symlink race fix.
+   * test: Fix flakiness in TEST-10-ISSUE-2467
+   * autopktest: Fix timedated test dependencies.
+     Add an explicit systemd-timesyncd dependency as it is required by the
+     timedated test.
+   * autopkgtest: Merge configuration of logind test with timedated and related
+     tests.
+     They share the same restrictions and merging them avoids a bit of
+     duplication.
+   * Revert "test: disable DnsmasqClientTest.test_resolved_etc_hosts in
+     networkd-test.py"
+     Let's see if this test is still flaky on debci.
+   * networkd-test: fix resolved_domain_restricted_dns.
+     Cherry-pick upstream commit which hopefully fixes the flakiness in
+     DnsmasqClientTest.test_resolved_domain_restricted_dns.
+ 
+  -- Michael Biebl <biebl@debian.org>  Fri, 01 Oct 2021 10:12:14 +0200
+ 
+ systemd (247.9-3) unstable; urgency=medium
+ 
+   * Revert multipath symlink race fix.
+     Revert upstream commits which caused a regression in udev resulting in
+     long delays when processing partitions with the same label.
+     (Closes: #993738)
+ 
+  -- Michael Biebl <biebl@debian.org>  Sat, 25 Sep 2021 22:01:17 +0200
+ 
+ systemd (247.9-2) unstable; urgency=medium
+ 
+   * Demote systemd-timesyncd from Depends to Recommends.
+     This avoids a dependency cycle between systemd and systemd-timesyncd and
+     thus makes dist upgrades more predictable and robust.
+     It also allows minimal, systemd based containers where no NTP client is
+     strictly necessary.
+     To ensure that systemd-timesyncd is installed in a default installation
+     created by d-i, bump its priority to standard. (Closes: #986651, #993947)
+ 
+  -- Michael Biebl <biebl@debian.org>  Wed, 22 Sep 2021 21:10:53 +0200
  
  systemd (247.9-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge