Merge branch 'acpi-dsm'

* acpi-dsm:
  ACPI / extlog: replace open-coded _DSM code with helper functions
  ACPI / nouveau: replace open-coded _DSM code with helper functions
  nouveau / ACPI: fix memory leak in ACPI _DSM related code
  ACPI / i915: replace open-coded _DSM code with helper functions
  ACPI / i2c-hid: replace open-coded _DSM code with helper functions
  ACPI / TPM: detect PPI features by checking availability of _DSM functions
  ACPI / TPM: replace open-coded _DSM code with helper functions
  ACPI / TPM: match node name instead of full path when searching for TPM device
  PCI / pci-label: treat PCI label with index 0 as valid label
  ACPI / PCI: replace open-coded _DSM code with helper functions
  PCI / pci-label: release allocated ACPI object on error recovery path
  ACPI: introduce helper interfaces for _DSM method

diff --cc drivers/acpi/acpi_extlog.c
Simple merge

diff --cc drivers/acpi/utils.c
Simple merge

diff --cc drivers/char/tpm/tpm_ppi.c
index 70dbee4,117fab6..b3ea223
--- 1/drivers/char/tpm/tpm_ppi.c
--- 2/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@@ -1,15 -1,7 +1,6 @@@
  #include <linux/acpi.h>
 -#include <acpi/acpi_drivers.h>
  #include "tpm.h"
  
- static const u8 tpm_ppi_uuid[] = {
-       0xA6, 0xFA, 0xDD, 0x3D,
-       0x1B, 0x36,
-       0xB4, 0x4E,
-       0xA4, 0x24,
-       0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53
- };
- static char *tpm_device_name = "TPM";
- 
  #define TPM_PPI_REVISION_ID   1
  #define TPM_PPI_FN_VERSION    1
  #define TPM_PPI_FN_SUBREQ     2

diff --cc drivers/gpu/drm/i915/intel_acpi.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_acpi.c
Simple merge

diff --cc drivers/pci/pci-label.c
Simple merge

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