linux-kernel - linux-next: manual merge of the sfi tree with the acpi 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090817180610.0de34cab.sfr@canb.auug.org.au>
Date:	Mon, 17 Aug 2009 18:06:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	<sfi-devel@...plefirmware.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Len Brown <len.brown@...el.com>
Subject: linux-next: manual merge of the sfi tree with the acpi tree

Hi all,

Today's linux-next merge of the sfi tree got a conflict in
drivers/acpi/tables.c between commit
44043a4299724bb386ac7915a57a18b176e9df07 ("ACPI: check acpi_disabled in
acpi_table_parse()") from the acpi tree and commit
55ec50ee899aa3199c126bb4b740abb9a4ab51df ("ACPI: check acpi_disabled in
acpi_table_parse() and acpi_table_parse_entries()") from the sfi tree.

I used the sfi tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped