Merge commit 'b39a2770ba55637da80e2e389222c59dbea73507'

diff --cc src/hostname/hostnamed.c
Simple merge

diff --cc src/libsystemd/sd-bus/bus-util.c
Simple merge

diff --cc src/libsystemd/sd-bus/bus-util.h
index f760a1e80e5d87062292b8ac9013dcf2b285ea45,b3b52af24cbc0a277af9134a0d7926636a321751..1ac46875b273ece72a2f3d39948d417d180b9a9a
--- 1/src/libsystemd/sd-bus/bus-util.h
--- 2/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libsystemd/sd-bus/bus-util.h
@@@ -62,10 -62,10 +62,10 @@@ int bus_name_has_owner(sd_bus *c, cons
  
  int bus_check_peercred(sd_bus *c);
  
 -int bus_verify_polkit(sd_bus *bus, sd_bus_message *m, const char *action, bool interactive, bool *_challenge, sd_bus_error *e);
 +int bus_verify_polkit(sd_bus *bus, sd_bus_message *m, int capability, const char *action, bool interactive, bool *_challenge, sd_bus_error *e);
  
 -int bus_verify_polkit_async(sd_bus *bus, Hashmap **registry, sd_bus_message *m, const char *action, bool interactive, sd_bus_error *error, sd_bus_message_handler_t callback, void *userdata);
 +int bus_verify_polkit_async(sd_bus *bus, Hashmap **registry, sd_bus_message *m, int capability, const char *action, bool interactive, sd_bus_error *error, sd_bus_message_handler_t callback, void *userdata);
- void bus_verify_polkit_async_registry_free(sd_bus *bus, Hashmap *registry);
+ void bus_verify_polkit_async_registry_free(Hashmap *registry);
  
  int bus_open_system_systemd(sd_bus **_bus);
  int bus_open_user_systemd(sd_bus **_bus);

diff --cc src/locale/localed.c
Simple merge

diff --cc src/timedate/timedated.c
Simple merge