lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] phy: for v4.2 merge window
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


\
 
 \ /
  Last update: 2015-06-03 08:01    [W:0.065 / U:2.352 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site