Re: linux-next: manual merge of the driver-core tree with thesuspend tree

[Greg KH]

On Tue, Feb 02, 2010 at 05:01:55PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/power/main.c between commit
> de20f9bde404252647645f9f948c8c5de16cc51d ("PM: Asynchronous suspend and
> resume of devices") from the suspend tree and commit
> df5a0aec4591ae8a5deb67bc8cb6be3d0812abb2 ("drivers/base: Convert dev->sem
> to mutex") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Fix looks fine, thanks for doing this.

greg k-h
--
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/