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

[Stephen Rothwell]

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: detect PPI features by checking availability of _DSM
functions") from the pm tree and commits 747d35bd9bb4 ("tpm/tpm_ppi: Do
not compare strcmp(a,b) == -1") and 238b1eaa59e6 ("tpm/tpm_ppi: Check
return value of acpi_get_name") from the security tree.

I fixed it up (all of the latter patches have been subsumed by changes in
the former ones) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpAtDb6PiElf.pgp
Description: PGP signature