Re: linux-next: manual merge of the driver-core tree with the pm tree
From: Rafael J. Wysocki
Date: Mon Feb 11 2013 - 07:04:10 EST
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!
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/