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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140107144638.5227139098f6cf772a162f35@canb.auug.org.au>
Date:	Tue, 7 Jan 2014 14:46:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Morris <jmorris@...ei.org>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Huewe <PeterHuewe@....de>,
	Jiang Liu <jiang.liu@...ux.intel.com>
Subject: 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: 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                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped