Messages in this thread | | | Date | Tue, 2 Feb 2010 07:22:53 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the suspend tree |
| |
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
| |