linux-next: manual merge of the security tree with the pm tree

Hi James, Today's linux-next merge of the security tree got a conflict in drivers/char/tpm/tpm_ppi.c between commits df45c712d1f4 ("ACPI / TPM: fix memory leak when walking ACPI namespace"), 84b1667dea23 ("ACPI / TPM: replace open-coded _DSM code with helper functions") and 1569a4c4ceba ("ACPI /

linux-next: manual merge of the security tree with the pm tree

Hi James, Today's linux-next merge of the security tree got a conflict in drivers/char/tpm/tpm_ppi.c between commits df45c712d1f4 (ACPI / TPM: fix memory leak when walking ACPI namespace), 84b1667dea23 (ACPI / TPM: replace open-coded _DSM code with helper functions) and 1569a4c4ceba (ACPI / TPM: