Re: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

On Tue, Nov 11, 2014 at 04:23:22PM +1100, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0: > fix for dead code") from the usb-gadget-fixes tree and commit > ccb072de5702

Re: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

On Sat, Aug 23, 2014 at 05:57:23AM +1000, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb: > phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from the > usb