Merge pull request #16596 from poettering/event-time-rel

Conflict in src/libsystemd-network/test-ndisc-rs.c fixed manually.

diff --cc TODO
Simple merge

diff --cc src/libsystemd-network/test-dhcp6-client.c
Simple merge

diff --cc src/libsystemd-network/test-ndisc-rs.c
index 3f46c8d0c58bb97436cb343dca897f57c690e5cd,db617f93fc98ee08e3ffc5dc7dac37f1d0fb23da..2c4ffb94dd8f278093aa8a0c0392a72a3ce58e12
--- 1/src/libsystemd-network/test-ndisc-rs.c
--- 2/src/libsystemd-network/test-ndisc-rs.c
+++ b/src/libsystemd-network/test-ndisc-rs.c
@@@ -290,9 -289,10 +289,10 @@@ static void test_rs(void) 
          assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);
          assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0);
  
-         assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(),
-                                     time_now + 30 * USEC_PER_SEC, 0,
-                                     test_rs_hangcheck, NULL) >= 0);
+         assert_se(sd_event_add_time_relative(
+                                   e, &test_hangcheck, clock_boottime_or_monotonic(),
 -                                  2 *USEC_PER_SEC, 0,
++                                  30 * USEC_PER_SEC, 0,
+                                   test_rs_hangcheck, NULL) >= 0);
  
          assert_se(sd_ndisc_stop(nd) >= 0);
          assert_se(sd_ndisc_start(nd) >= 0);
@@@ -392,9 -391,10 +391,10 @@@ static void test_timeout(void) 
          assert_se(sd_ndisc_set_ifindex(nd, 42) >= 0);
          assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);
  
-         assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(),
-                                     time_now + 30 * USEC_PER_SEC, 0,
-                                     test_rs_hangcheck, NULL) >= 0);
+         assert_se(sd_event_add_time_relative(
+                                   e, &test_hangcheck, clock_boottime_or_monotonic(),
 -                                  2U * USEC_PER_SEC, 0,
++                                  30 * USEC_PER_SEC, 0,
+                                   test_rs_hangcheck, NULL) >= 0);
  
          assert_se(sd_ndisc_start(nd) >= 0);
  

diff --cc src/timesync/timesyncd-manager.c
Simple merge