Messages in this thread | | | Date | Thu, 27 Jun 2013 08:36:38 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the pm tree |
| |
On Thu, Jun 27, 2013 at 05:14:18PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > include/linux/device.h between commit 4f3549d72d1b ("Driver core: Add > offline/online device operations") from the pm tree and commit > bfd63cd24df6 ("driver core: device.h: fix doc compilation warnings") from > the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me, thanks.
greg k-h
| |