linux-kernel - Re: [SFI-devel] 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-prev] [day] [month] [year] [list]

Message-id: <alpine.LFD.2.00.0908281946220.27023@localhost.localdomain>
Date:	Fri, 28 Aug 2009 19:47:34 -0400 (EDT)
From:	Len Brown <lenb@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	sfi-devel@...plefirmware.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [SFI-devel] linux-next: manual merge of the sfi tree with the acpi
 tree

On Mon, 17 Aug 2009, Stephen Rothwell wrote:

> 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.

thanks.
this should be fixed now, and both trees should again include
the identical commits where they overlap.

-Len Brown, Intel Open Source Technology Center

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/