From: Kishon Vijay Abraham I <kishon@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] phy: for v4.2 merge window
Date: Wed, 3 Jun 2015 11:02:58 +0530 [thread overview]
Message-ID: <556E918A.8050105@ti.com> (raw)
In-Reply-To: <20150603051423.GB26680@kroah.com>
Hi Greg,
On Wednesday 03 June 2015 10:44 AM, Greg KH wrote:
> On Tue, Jun 02, 2015 at 08:13:31PM +0530, Kishon Vijay Abraham I wrote:
>> Hi Greg,
>>
>> Here's the PHY pull request for 4.2 merge window. Please find below
>> the list of changes that goes in this pull request.
>>
>> There was a merge conflict in Makefile and Kconfig while trying to merge
>> with your usb-next branch. It's because one of the PHY drivers (TUSB1210)
>> went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it
>> conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and
>> BRCMSTB_SATA present.
>>
>> Let me know If I have to change something.
>
> Nope, that should be fine. I've pulled and pushed out the tree now,
> please verify I did the merge correctly.
The merge was correct.
Thanks
Kishon
prev parent reply other threads:[~2015-06-03 5:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 14:43 [GIT PULL] phy: for v4.2 merge window Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 01/14] phy: core: Add devm_of_phy_get_by_index to phy-core Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 02/14] usb: ehci-platform: Use devm_of_phy_get_by_index Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 03/14] usb: ohci-platform: " Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 04/14] phy: phy-core: allow specifying supply at port level Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 05/14] phy: miphy28lp: fix sparse warnings Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 06/14] phy: miphy365x: " Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 07/14] phy: core: Check requested PHY status in _of_phy_get() Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 08/14] phy: rcar-gen2: Add support for R-Car E2 Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 09/14] Documentation: devicetree: add Broadcom SATA PHY binding Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 10/14] phy: add Broadcom SATA3 PHY driver for Broadcom STB SoCs Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 11/14] phy: twl4030-usb: make runtime pm more reliable Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 12/14] phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 13/14] phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function Kishon Vijay Abraham I
2015-06-02 14:43 ` [PATCH 14/14] phy: twl4030-usb: add ABI documentation Kishon Vijay Abraham I
2015-06-03 5:14 ` [GIT PULL] phy: for v4.2 merge window Greg KH
2015-06-03 5:32 ` Kishon Vijay Abraham I [this message]
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=556E918A.8050105@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@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.