Merge version 247.3-6+rpi1 and 247.3-7 to produce 247.3-7+rpi1

diff --cc debian/changelog
index a3184c8b952f9ef608c888c898c15b727675801b,ddb3701612a861ce9bf03c09d387c79c09b3cbcc..1095b8b898e835b3a7162fe2bedc31ba59db3a9a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,32 +1,46 @@@
- systemd (247.3-6+rpi1) bullseye-staging; urgency=medium
++systemd (247.3-7+rpi1) bullseye-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>  Sat, 07 Aug 2021 03:58:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Mar 2022 05:42:11 +0000
++
+ systemd (247.3-7) bullseye; urgency=medium
+ 
+   * Switch debian-branch to debian/bullseye
+   * udevadm-trigger: do not return immediately on EACCES.
+     Fixes a regression when using systemd-networkd in an unprivileged LXD
+     container. (Closes: #997006)
+   * 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)
+   * shared/rm-rf: loop over nested directories instead of recursing.
+     Fixes uncontrolled recursion in systemd-tmpfiles.
+     (CVE-2021-3997, Closes: #1003467)
+   * 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)
+   * autopktest: Fix timedated test dependencies.
+     Add an explicit systemd-timesyncd dependency as it is required by the
+     timedated test.
+   * machine: enter target PID namespace when adding a live mount.
+     Fixes failure to bind mount a directory into a container using
+     machinectl. (Closes: #993248)
+ 
+  -- Michael Biebl <biebl@debian.org>  Sun, 20 Mar 2022 20:55:25 +0100
  
  systemd (247.3-6) unstable; urgency=high
  

diff --cc debian/control
Simple merge