Merge tag 'devprop-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull device properties framework updates from Rafael Wysocki:
 "This introduces 'software nodes' that are analogous to the DT and ACPI
  firmware nodes except that they can be created by drivers themselves
  and do a couple of assorted cleanups.

  Specifics:

   - Introduce "software nodes", analogous to the DT and ACPI firmware
     nodes except that they can be created by kernel code, in order to
     complement fwnodes representing real firmware nodes when they are
     incomplete (for example missing device properties) and to supply
     the primary fwnode when the firmware lacks hardware description for
     a device completely, and replace the "property_set" struct
     fwnode_handle type with software nodes (Heikki Krogerus).

   - Clean up the just introduced software nodes support and fix a
     commet in the graph-handling code (Colin Ian King, Marco Felsch)"

* tag 'devprop-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: fix fwnode_graph_get_next_endpoint() documentation
  drivers: base: swnode: remove need for a temporary string for the node name
  device property: Remove struct property_set
  device property: Move device_add_properties() to swnode.c
  drivers: base: Introducing software nodes to the firmware node framework
  ACPI / glue: Add acpi_platform_notify() function
  drivers core: Prepare support for multiple platform notifications
  driver core: platform: Remove duplicated device_remove_properties() call

diff --cc drivers/acpi/internal.h
index c112dccc76b5049d33b8956f9012b3ce05ac6e55,83a7dfb7d1cf7165fe77882f7c5c5209a4969d93..7e6952edb5b07d44c482f713b9e5349b2cfa760a
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -23,15 -23,9 +23,14 @@@
  int early_acpi_osi_init(void);
  int acpi_osi_init(void);
  acpi_status acpi_os_initialize1(void);
- void init_acpi_device_notify(void);
  int acpi_scan_init(void);
 +#ifdef CONFIG_PCI
  void acpi_pci_root_init(void);
  void acpi_pci_link_init(void);
 +#else
 +static inline void acpi_pci_root_init(void) {}
 +static inline void acpi_pci_link_init(void) {}
 +#endif
  void acpi_processor_init(void);
  void acpi_platform_init(void);
  void acpi_pnp_init(void);

diff --cc include/linux/acpi.h
Simple merge