Messages in this thread | | | Date | Thu, 24 Jul 2014 00:45:15 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the samsung tree |
| |
On Thu, Jul 24, 2014 at 04:38:34PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/phy/phy-samsung-usb2.c between commit 949ccc3a9363 ("phy: Add > support for S5PV210 to the Exynos USB 2.0 PHY driver") from the samsung > tree and commit 016e0d3cb72c ("drivers: phy: exynos-usb2: add support > for Exynos 3250") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |