Merge pull request #34123 from yuwata/sd-device

sd-device: expose sd_device_get_device_id() and sd_device_get_driver_subsystem()

diff --cc src/libsystemd/libsystemd.sym
index a808f00fbf3069c7a74200810d67557067c0813b,84053ee7c920f768645b335310374c0134885175..acee085f2f18d177b44560f24dc62708c22c3e24
--- 1/src/libsystemd/libsystemd.sym
--- 2/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@@ -1046,9 -1046,9 +1046,11 @@@ global
          sd_varlink_take_fd;
          sd_varlink_unref;
          sd_varlink_wait;
+         sd_device_get_device_id;
+         sd_device_get_driver_subsystem;
          sd_device_monitor_is_running;
          sd_device_monitor_get_fd;
 +        sd_device_monitor_get_events;
 +        sd_device_monitor_get_timeout;
          sd_device_monitor_receive;
  } LIBSYSTEMD_256;

diff --cc src/systemd/sd-device.h
Simple merge