Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1483917

Re: [GIT PULL] phy: for 4.9

Show all headers | View raw

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?

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?

thanks,

greg k-h

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] phy: for 4.9 Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 38/51] phy: Add USB Type-C PHY driver for rk3399 Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 34/51] extcon: Add new EXTCON_DISP_HMD for Head-mounted Display device Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 48/51] phy: rockchip-usb: use rockchip_usb_phy_reset to reset phy during wakeup Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 14/51] phy: rcar-gen3-usb2: revise the example of device tree doc Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 36/51] extcon: Introduce EXTCON_PROP_USB_SS property for SuperSpeed mode Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 46/51] phy-sun4i-usb: Warn when external vbus is detected Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 43/51] phy-sun4i-usb: Refactor forced session ending Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 10/51] phy: tegra: add missing header dependencies Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 37/51] phy: da8xx-usb: Fix syscon device name Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 05/51] phy: qcom-ufs: use of_property_read_bool Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 32/51] extcon: Add the synchronization extcon APIs to support the notification Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 33/51] extcon: Add EXTCON_DISP_DP and the property for USB Type-C Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 42/51] phy-sun4i-usb: Use bool where appropriate Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 51/51] phy-twl4030-usb: initialize charging-related stuff via pm_runtime Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 39/51] Documentation: bindings: add dt doc for Rockchip USB Type-C PHY Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 09:50 +0200
  [PATCH 29/51] extcon: Add the support for extcon property according to extcon type Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 08/51] Documentation: bindings: add dt documentation for Rockchip PCIe PHY Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 03/51] phy: sun4i: add support for A64 usb phy Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 31/51] extcon: Rename the extcon_set/get_state() to maintain the function naming pattern Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 23/51] extcon: adc-jack: Remove the usage of extcon_set_state() Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 30/51] extcon: Add the support for the capability of each property Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 01/51] phy: exynos5-usbdrd: Remove "static" from local variable Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 07/51] phy: rockchip-inno-usb2: add a new driver for Rockchip usb2phy Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 27/51] extcon: Fix compile time warning Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 18/51] phy: rockchip-inno-usb2: add COMMON_CLK dependency Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 11/51] phy: tegra: mark tegra_xusb_lane_lookup_function() static Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 16/51] phy: omap-usb2: support suspend/resume Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 26/51] extcon: Block the bit masking operation for cable state except for extcon core Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 09/51] phy: add a driver for the Rockchip SoC internal PCIe PHY Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 24/51] extcon: gpio: Remove the usage of extcon_set_state() Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 19/51] extcon: adc-jack: update cable state during boot Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 13/51] phy: bcm-ns2-pcie: Set missing .owner field in ns2_pci_phy_ops Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 22/51] extcon: arizona: Remove the usage of extcon_update_state() Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 21/51] extcon: arizona: Remove unneeded semi-colon Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  [PATCH 04/51] phy: bcm-ns-usb3: new driver for USB 3.0 PHY on Northstar Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-14 10:00 +0200
  Re: [GIT PULL] phy: for 4.9 Greg KH <gregkh@linuxfoundation.org> - 2016-09-15 10:50 +0200
    Re: [GIT PULL] phy: for 4.9 Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-15 12:30 +0200
      Re: [GIT PULL] phy: for 4.9 Greg KH <gregkh@linuxfoundation.org> - 2016-09-15 12:40 +0200
        Re: [GIT PULL] phy: for 4.9 Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-15 13:00 +0200
          Re: [GIT PULL] phy: for 4.9 Kishon Vijay Abraham I <kishon@ti.com> - 2016-09-15 13:20 +0200

csiph-web