From: Kishon Vijay Abraham I <kishon@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
Felipe Balbi <balbi@ti.com>
Subject: Re: [GIT PULL 00/28] PHY for 3.15
Date: Sun, 9 Mar 2014 13:05:36 +0530 [thread overview]
Message-ID: <531C19C8.4080806@ti.com> (raw)
In-Reply-To: <20140308164222.GA28789@kroah.com>
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
next prev parent reply other threads:[~2014-03-09 7:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-08 9:29 [GIT PULL 00/28] PHY for 3.15 Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 01/28] usb: phy: twl4030-usb: Silence checkpatch warnings Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 02/28] usb: phy: twl4030-usb: Remove redundant semicolon Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 03/28] usb: phy: bcm-kona-usb2: Use PTR_ERR_OR_ZERO Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 04/28] phy: Select PHY_EXYNOS_MIPI_VIDEO by default for ARCH_EXYNOS Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 05/28] phy: Select PHY_EXYNOS_DP_VIDEO " Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 06/28] PHY: Exynos: Add Exynos5250 SATA PHY driver Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 07/28] PHY: sunxi: Add driver for sunxi usb phy Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 08/28] phy: mvebu-sata: prepare new Dove DT Kconfig variable Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 09/28] drivers: phy: usb3/pipe3: Adapt pipe3 driver to Generic PHY Framework Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 10/28] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 11/28] phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/ Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 12/28] phy: core: Add an exported of_phy_get function Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 13/28] phy: core: Add devm_of_phy_get to phy-core Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 14/28] phy: Add new Exynos USB 2.0 PHY driver Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 15/28] phy: Add Exynos 5250 support to the " Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 16/28] phy: omap-usb2: Adapt phy-omap-usb2 for AM437x Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 17/28] phy: omap-usb2: Provide workaround for USB2PHY false disconnect Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 18/28] phy: omap-usb2: Add different compatible for OMAP5 Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 19/28] phy: rename struct omap_control_usb to struct omap_control_phy Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 20/28] phy: omap-control: update dra7 and am437 usb2 bindings Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 21/28] phy: ti-pipe3: cleanup clock handling Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 22/28] phy: ti-pipe3: Add SATA DPLL support Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 23/28] phy: ti-pipe3: Don't get 'wkupclk' and 'refclk' for SATA PHY Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 24/28] phy: ti-pipe3: streamline PHY operations Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 25/28] phy: ti-pipe3: Fix suspend/resume and module reload Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 26/28] phy: omap: Depend on OMAP_OCP2SCP bus driver Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 27/28] Documentation: Add APM X-Gene SoC 15Gbps Multi-purpose PHY driver binding documentation Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 28/28] PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver Kishon Vijay Abraham I
2014-03-08 16:42 ` [GIT PULL 00/28] PHY for 3.15 Greg KH
2014-03-09 7:35 ` Kishon Vijay Abraham I [this message]
2014-03-09 16:55 ` Greg KH
2014-03-09 7:27 ` [PATCH 16/28 v2] phy: omap-usb2: Adapt phy-omap-usb2 for AM437x Kishon Vijay Abraham I
2014-03-09 7:27 ` [PATCH 17/28 v2] phy: omap-usb2: Provide workaround for USB2PHY false disconnect Kishon Vijay Abraham I
2014-03-09 7:27 ` [PATCH 18/28 v2] phy: omap-usb2: Add different compatible for OMAP5 Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=531C19C8.4080806@ti.com \
--to=kishon@ti.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.