linux-kernel - Re: linux-next: manual merge of the driver-core 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 for Android: free password hash cracker in your pocket

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

Date:	Mon, 11 Feb 2013 13:10:29 +0100
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Kees Cook <keescook@...omium.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree

On Monday, February 11, 2013 03:42:55 PM Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/acpi/Kconfig between commit cb2b212bc7ff ("ACPI / scan: Make
> container driver use struct acpi_scan_handler") from the pm tree and
> commit f756f28b84af ("drivers/acpi: remove depends on CONFIG_EXPERIMENTAL")
> from the driver-core tree.
> 
> I fixed it up and can carry the fix as necessary (no action is required).

Thanks for the notice and for fixing this!

Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, 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/