Messages in this thread |  | | Date | Thu, 31 Oct 2013 15:16:28 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the tree |
| |
On Mon, Oct 28, 2013 at 11:01:52PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/Kconfig between commit 12cc4b3827f8 ("PowerCap: Add to drivers > Kconfig and Makefile") from the pm tree and commit ff764963479a > ("drivers: phy: add generic PHY framework") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks fine to me, thanks.
greg k-h
|  |