From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932570AbbFEKxY (ORCPT <rfc822;w@1wt.eu>);
	Fri, 5 Jun 2015 06:53:24 -0400
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43278 "EHLO
	out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751534AbbFEKxT (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 5 Jun 2015 06:53:19 -0400
X-Sasl-enc: vjSTivqHJva55hIZX5uUh0zOeA/8u3hG+re6Kpvp/zfz 1433501596
Date: Fri, 5 Jun 2015 19:53:14 +0900
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Andrew Bresticker <abrestic@chromium.org>,
        Brian Norris <computersforpeace@gmail.com>,
        Kishon Vijay Abraham I <kishon@ti.com>
Subject: Re: linux-next: manual merge of the usb tree with the mips tree
Message-ID: <20150605105314.GC5346@kroah.com>
References: <20150604183933.5f403cfd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150604183933.5f403cfd@canb.auug.org.au>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Jun 04, 2015 at 06:39:33PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for
> Pistachio USB2.0 PHY") from the mips tree and commit 0d486806ffd0 ("phy:
> add Broadcom SATA3 PHY driver for Broadcom STB SoCs") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/phy/Makefile
> index 75a37dc952f5,bc92b427e5ca..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -40,4 -40,5 +40,6 @@@ obj-$(CONFIG_PHY_STIH41X_USB)		+= phy-s
>   obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs.o
>   obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-20nm.o
>   obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-14nm.o
>  +obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
> + obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o
> + obj-$(CONFIG_PHY_BRCMSTB_SATA)		+= phy-brcmstb-sata.o


Thanks, that looks correct to me.

greg k-h