README

@@ -50,6 +50,7 @@ REQUIREMENTS:
 
         ⛔ Kernel versions below 5.4 ("minimum baseline") are not supported at all,
            and are missing required functionality as listed above.
+           # FIXME: actually drop compat glue before v258
 
         Linux kernel ≥ 5.6 for getrandom() GRND_INSECURE
                      ≥ 5.7 for CLONE_INTO_CGROUP, cgroup2fs memory_recursiveprot option,

hwdb.d/60-sensor.hwdb

@@ -662,10 +662,6 @@ sensor:modalias:acpi:BMA250*:dmi:*:bvritWORKS.G.WI71C.JGBMRB*:*:svnInsyde:pni71c
 # Irbis
 #########################################
 
-#TW43
-sensor:modalias:acpi:BMA250E*:dmi:*:svnIRBIS:pnTW43:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, -1
-
 #TW90
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnIRBIS:pnTW90:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1

src/cryptsetup/cryptsetup.c

@@ -586,7 +586,7 @@ static int parse_one_option(const char *option) {
                         log_warning_errno(r, "Failed to parse %s, ignoring: %m", option);
 
         } else if ((val = startswith(option, "link-volume-key="))) {
-#if HAVE_CRYPT_SET_KEYRING_TO_LINK
+#ifdef HAVE_CRYPT_SET_KEYRING_TO_LINK
                 _cleanup_free_ char *keyring = NULL, *key_type = NULL, *key_description = NULL;
                 const char *sep;
 

test/units/TEST-17-UDEV.watch.sh

@@ -24,13 +24,14 @@ function check_validity() {
 
 function check() {
     for _ in {1..2}; do
+        # To make journal not rotated during checking journals below.
+        journalctl --rotate
+
         systemctl reset-failed systemd-udevd.service
         systemctl restart systemd-udevd.service
         udevadm settle --timeout=30
 
         journalctl --sync
-        # Also rotate journal to make expected journal entries in an archived journal file.
-        journalctl --rotate
 
         # Check if the inotify watch fd is received from fd store.
         journalctl -n 1 -q -u systemd-udevd.service --invocation=0 --grep 'Received inotify fd \(\d+\) from service manager.'