hwdb.d/70-touchpad.hwdb

@@ -43,7 +43,6 @@ touchpad:bluetooth:*
 # Magic Trackpad (1 and 2)
 touchpad:usb:v05acp030e:*
 touchpad:usb:v05acp0265:*
-touchpad:usb:v05acp0324:*
  ID_INPUT_TOUCHPAD_INTEGRATION=external
 
 ###########################################################

test/integration-tests/integration-test-wrapper.py

@@ -617,13 +617,7 @@ def main() -> None:
 
     # XXX: debug for https://github.com/systemd/systemd/issues/38240
     if vm:
-        # Tracing is not supported in centos/fedora qemu builds
-        if summary.distribution in ('centos', 'fedora'):
         cmd += ['--qemu-args=-d cpu_reset,guest_errors -D /dev/stderr']
-        else:
-            cmd += [
-                '--qemu-args=-d cpu_reset,guest_errors,trace:kvm_run_exit_system_event,trace:qemu_system_\*_request -D /dev/stderr'  # noqa: E501
-            ]
 
     try:
         result = subprocess.run(cmd)

test/test-network/systemd-networkd-tests.py

@@ -8630,6 +8630,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
 
         start_networkd()
         self.wait_online('veth-peer:carrier')
+        masq = lambda bs: ':'.join(f'{b:02x}' for b in bs)
         start_dnsmasq('--dhcp-option=114,http://|invalid/url',
                       '--dhcp-option=option6:103,http://|invalid/url')