On Sat, Mar 08, 2014 at 02:59:01PM +0530, Kishon Vijay Abraham I wrote: > Hi Greg, > > Here's the PULL REQUEST for 3.15 merge window. > More users are starting to use the generic PHY framework including USB and > SATA PHY in exynos, USB in sunxi and multi-purpose PHY (currently only SATA) > in APM. There is also a patch to adapt USB3 PHY driver (PIPE3) used in OMAP > to generic PHY framework and use the same driver for SATA. > It also includes few fixes and cleanups. > > Please let me know if you want me to make any changes. > > Cheers > Kishon > > The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691: > > Linux 3.14-rc4 (2014-02-23 17:40:03 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.15 > > for you to fetch changes up to 303fd52cda953d14dc82ac82b570761599eb9ab2: > > PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver (2014-03-08 12:39:51 +0530) When merging this with my usb-next tree, I get the following merge issue, which I don't know how to resolve: CONFLICT (modify/delete): Documentation/devicetree/bindings/usb/usb-phy.txt deleted in HEAD and modified in a0100026249158ec7aae606b553efae7cb37f616. Version a0100026249158ec7aae606b553efae7cb37f616 of Documentation/devicetree/bindings/usb/usb-phy.txt left in tree. Any suggestions as to what I should do here? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
