From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934001AbcIOIiv (ORCPT ); Thu, 15 Sep 2016 04:38:51 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50698 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764479AbcIOIiD (ORCPT ); Thu, 15 Sep 2016 04:38:03 -0400 Date: Thu, 15 Sep 2016 10:38:09 +0200 From: Greg KH To: Kishon Vijay Abraham I Cc: linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] phy: for 4.9 Message-ID: <20160915083809.GA12466@kroah.com> References: <1473839072-5673-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1473839072-5673-1-git-send-email-kishon@ti.com> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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