From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752377AbbFCFdK (ORCPT ); Wed, 3 Jun 2015 01:33:10 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:41590 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441AbbFCFdC (ORCPT ); Wed, 3 Jun 2015 01:33:02 -0400 Message-ID: <556E918A.8050105@ti.com> Date: Wed, 3 Jun 2015 11:02:58 +0530 From: Kishon Vijay Abraham I User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Greg KH CC: Subject: Re: [GIT PULL] phy: for v4.2 merge window References: <1433256225-476-1-git-send-email-kishon@ti.com> <20150603051423.GB26680@kroah.com> In-Reply-To: <20150603051423.GB26680@kroah.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, On Wednesday 03 June 2015 10:44 AM, Greg KH wrote: > 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. The merge was correct. Thanks Kishon