lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 9 Mar 2014 13:05:36 +0530 From: Kishon Vijay Abraham I <kishon@...com> To: Greg KH <gregkh@...uxfoundation.org> CC: <linux-kernel@...r.kernel.org>, <linux-usb@...r.kernel.org>, Felipe Balbi <balbi@...com> Subject: Re: [GIT PULL 00/28] PHY for 3.15 Hi Greg, On Saturday 08 March 2014 10:12 PM, Greg KH wrote: > 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? There were 3 patches that modified usb-phy.txt but the file was moved to phy/ti-phy.txt in balbi's branch. I've resent the patches that modified this file and have also updated tags/for_3.15. Let me know If I have to resend the PULL request. Sorry for the hassle. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists