From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752026AbbFCFOe (ORCPT ); Wed, 3 Jun 2015 01:14:34 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:51874 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbbFCFO0 (ORCPT ); Wed, 3 Jun 2015 01:14:26 -0400 Date: Wed, 3 Jun 2015 14:14:23 +0900 From: Greg KH To: Kishon Vijay Abraham I Cc: linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] phy: for v4.2 merge window Message-ID: <20150603051423.GB26680@kroah.com> References: <1433256225-476-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433256225-476-1-git-send-email-kishon@ti.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 02, 2015 at 08:13:31PM +0530, Kishon Vijay Abraham I wrote: > Hi Greg, > > Here's the PHY pull request for 4.2 merge window. Please find below > the list of changes that goes in this pull request. > > There was a merge conflict in Makefile and Kconfig while trying to merge > with your usb-next branch. It's because one of the PHY drivers (TUSB1210) > went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it > conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and > BRCMSTB_SATA present. > > Let me know If I have to change something. Nope, that should be fine. I've pulled and pushed out the tree now, please verify I did the merge correctly. thanks, greg k-h