Merge branch 'acpi-tables'

* acpi-tables:
  ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
  ACPI: add support for loading SSDTs via configfs
  ACPI: add support for configfs
  efi / ACPI: load SSTDs from EFI variables
  spi / ACPI: add support for ACPI reconfigure notifications
  i2c / ACPI: add support for ACPI reconfigure notifications
  ACPI: add support for ACPI reconfiguration notifiers
  ACPI / scan: fix enumeration (visited) flags for bus rescans
  ACPI / documentation: add SSDT overlays documentation
  ACPI: ARM64: support for ACPI_TABLE_UPGRADE
  ACPI / tables: introduce ARCH_HAS_ACPI_TABLE_UPGRADE
  ACPI / tables: move arch-specific symbol to asm/acpi.h
  ACPI / tables: table upgrade: refactor function definitions
  ACPI / tables: table upgrade: use cacheable map for tables

Conflicts:
	arch/arm64/include/asm/acpi.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/include/asm/acpi.h
index 4b13ecd3977a9848db88ed0fc2f40b6dd25e6d7e,c7aefc56dfdd338b7cee9cb9383c131e2eea7ef9..5420cb0fcb3e069fb8e692bdbc42f119a5f73943
--- 1/arch/arm64/include/asm/acpi.h
--- 2/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@@ -113,12 -113,6 +113,14 @@@ static inline const char *acpi_get_enab
  pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);
  #endif
  
 +#ifdef CONFIG_ACPI_NUMA
 +int arm64_acpi_numa_init(void);
 +int acpi_numa_get_nid(unsigned int cpu, u64 hwid);
 +#else
 +static inline int arm64_acpi_numa_init(void) { return -ENOSYS; }
 +static inline int acpi_numa_get_nid(unsigned int cpu, u64 hwid) { return NUMA_NO_NODE; }
 +#endif /* CONFIG_ACPI_NUMA */
 +
+ #define ACPI_TABLE_UPGRADE_MAX_PHYS MEMBLOCK_ALLOC_ACCESSIBLE
+ 
  #endif /*_ASM_ACPI_H*/

diff --cc arch/x86/include/asm/acpi.h
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

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