Odd merge 3b30be3b6487 ("Merge tag 'v4.5-rc6' into next")

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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?

-Doug
--
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



[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux