From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764711AbcIOLN5 (ORCPT ); Thu, 15 Sep 2016 07:13:57 -0400 Received: from bear.ext.ti.com ([198.47.19.11]:53137 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755261AbcIOLN4 (ORCPT ); Thu, 15 Sep 2016 07:13:56 -0400 Subject: Re: [GIT PULL] phy: for 4.9 To: Greg KH References: <1473839072-5673-1-git-send-email-kishon@ti.com> <20160915083809.GA12466@kroah.com> <57DA7680.9@ti.com> <20160915103639.GA27845@kroah.com> <57DA7E73.7070208@ti.com> CC: Chanwoo Choi , From: Kishon Vijay Abraham I Message-ID: <57DA826C.20308@ti.com> Date: Thu, 15 Sep 2016 16:43:48 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <57DA7E73.7070208@ti.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, On Thursday 15 September 2016 04:26 PM, Kishon Vijay Abraham I wrote: > > > On Thursday 15 September 2016 04:06 PM, Greg KH wrote: >> On Thu, Sep 15, 2016 at 03:52:56PM +0530, Kishon Vijay Abraham I wrote: >>> +Chanwoo >>> >>> Hi Greg, >>> >>> On Thursday 15 September 2016 02:08 PM, Greg KH wrote: >>>> On Wed, Sep 14, 2016 at 01:13:41PM +0530, Kishon Vijay Abraham I wrote: >>>>> Hi Greg, >>>>> >>>>> Please find the phy pull request for 4.9 merge window below. It adds >>>>> 4 new phy drivers, adds support for a couple of phys using existing >>>>> drivers, adds phy_reset() API which can be used by the controller >>>>> drivers to reset the phy and includes misc fixes and cleanups. >>>>> >>>>> It also includes an immutable extcon branch (ib-extcon-phy-4.9) from >>>>> Chanwoo, since the Type-C PHY driver is dependent on extcon. >>>>> >>>>> Let me know if I have to change something. >>>>> >>>>> Thanks >>>>> Kishon >>>>> >>>>> The following changes since commit 017300da3a4547d85e52c2484fc0bd759e1bbcdb: >>>>> >>>>> phy: sun9i-usb: fix error handling (2016-08-12 14:59:10 +0530) >>>>> >>>>> are available in the git repository at: >>>>> >>>>> git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.9 >>>>> >>>>> for you to fetch changes up to b78ea84a7d45b9e5ad2eee429a2140065a39d755: >>>>> >>>>> phy-twl4030-usb: initialize charging-related stuff via pm_runtime (2016-09-14 10:59:12 +0530) >>>> >>>> commit c7914e8dfa4032d24ef7af4c86b9c841ec6b74e6 is odd, it is touching >>>> EXTCON_PROP_DISP_MAX without saying why in the changelog, what happened >>>> there? How do I resolve this? >>> >>> This came from the extcon tree. Chanwoo? >>>> >>>> There are merge issues when I pull this into my usb-next branch in a >>>> number of extcon files: >>>> drivers/extcon/extcon-adc-jack.c >>>> drivers/extcon/extcon-arizona.c >>>> drivers/extcon/extcon-gpio.c >>>> include/linux/extcon.h >>>> >>>> Now I can guess at the merge resolutions, but I doubt you want me to :) >>>> >>>> Can you give me a hint as to what to do here? >>> >>> I guess there was a change in the immutable branch ib-extcon-phy-4.9 after it >>> was merged to PHY tree. >>> >>> The resolution for extcon-adc-jack.c, extcon-arizona.c, extcon-gpio.c should be >>> based on the following patch (it replaces extcon_set_cable_state_ with >>> extcon_set_state_sync) >>> >>> https://git.kernel.org/cgit/linux/kernel/git/gregkh/usb.git/commit/?h=usb-next&id=8670b4598064007abfc44554e713fa2004734e1d >>> >>> The resolution for extcon.h should be based on >>> https://git.kernel.org/cgit/linux/kernel/git/gregkh/usb.git/commit/?h=usb-next&id=c7914e8dfa4032d24ef7af4c86b9c841ec6b74e6 >>> >>> Alternatively, I've resolved the conflicts and pushed the linux-phy tree. >>> git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git >>> tags/phy-for-4.9-resolved >> >> Can you do a new pull request for this, so I know I get it correctly? > > sure.. here it goes.. > > The following changes since commit 81522637485dd6ec9de4279c9714d58f884b6091: > > Merge tag 'usb-for-v4.9' of > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next > (2016-09-14 20:37:50 +0200) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git > tags/phy-for-4.9-updated please ignore this. I got an error with this. Will fix that and resend a fresh pull request. Thanks Kishon