From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752090AbaCHQls (ORCPT ); Sat, 8 Mar 2014 11:41:48 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:50991 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbaCHQlr (ORCPT ); Sat, 8 Mar 2014 11:41:47 -0500 Date: Sat, 8 Mar 2014 08:42:22 -0800 From: Greg KH To: Kishon Vijay Abraham I Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Felipe Balbi Subject: Re: [GIT PULL 00/28] PHY for 3.15 Message-ID: <20140308164222.GA28789@kroah.com> References: <1394270969-11851-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1394270969-11851-1-git-send-email-kishon@ti.com> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Mar 08, 2014 at 02:59:01PM +0530, Kishon Vijay Abraham I wrote: > Hi Greg, > > Here's the PULL REQUEST for 3.15 merge window. > More users are starting to use the generic PHY framework including USB and > SATA PHY in exynos, USB in sunxi and multi-purpose PHY (currently only SATA) > in APM. There is also a patch to adapt USB3 PHY driver (PIPE3) used in OMAP > to generic PHY framework and use the same driver for SATA. > It also includes few fixes and cleanups. > > Please let me know if you want me to make any changes. > > Cheers > Kishon > > The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691: > > Linux 3.14-rc4 (2014-02-23 17:40:03 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.15 > > for you to fetch changes up to 303fd52cda953d14dc82ac82b570761599eb9ab2: > > PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver (2014-03-08 12:39:51 +0530) When merging this with my usb-next tree, I get the following merge issue, which I don't know how to resolve: CONFLICT (modify/delete): Documentation/devicetree/bindings/usb/usb-phy.txt deleted in HEAD and modified in a0100026249158ec7aae606b553efae7cb37f616. Version a0100026249158ec7aae606b553efae7cb37f616 of Documentation/devicetree/bindings/usb/usb-phy.txt left in tree. Any suggestions as to what I should do here? thanks, greg k-h