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


The resolution for extcon.h should be based on

Alternatively, I've resolved the conflicts and pushed the linux-phy tree.


Reply via email to