On 3/4/2016 6:14 PM, Doug Anderson wrote:
> Hi,
>
> On Fri, Mar 4, 2016 at 5:56 PM, John Youn <John.Youn@xxxxxxxxxxxx> wrote:
>> On 3/4/2016 5:04 PM, Doug Anderson wrote:
>>> Felipe,
>>>
>>> Michael pointed out that there's an odd merge that happened.
>>> Specifically it looks like commit bd84f4ae9986 ("usb: dwc2: Add extra
>>> delay when forcing dr_mode") got lost somehow in the merge commit
>>> 3b30be3b6487 ("Merge tag 'v4.5-rc6' into next")
>>>
>>> Specifically:
>>>
>>> $ git blame 3b30be3b6487 -- drivers/usb/dwc2/core.c | grep "This is required"
>>> $ git blame 3b30be3b6487^2 -- drivers/usb/dwc2/core.c | grep "This is required"
>>> bd84f4ae9986a drivers/usb/dwc2/core.c (John Youn
>>> 2016-02-15 15:30:20 -0800 624) * NOTE: This is required for some
>>> rockchip soc based
>>>
>>>
>>> I think I'm about at the limit of my git-fu, so I'm a bit baffled.
>>> Any idea what happened? Was anything else lost?
>>>
>>
>>
>> Felipe recently rebased his next branch without the merge commit
>> referenced above. So maybe that's causing some issues.
>>
>> But everything seems ok to me. I see the commit and correct code on
>> 4.5-rc6, Felipe's next branch, and Greg's usb-next.
>
> They are missing from from next-20160304 and next-20160303 (though in
> next-20160302) as found by Michael.
>
> -Doug
>
Ah okay I do see that too. Could be because of the rebase...
Maybe it'll all be sorted by the next next tree :)
John
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
