linux-next: manual merge of the usb-gadget tree with Linus' tree

2017-06-12 Thread Stephen Rothwell
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in: drivers/usb/gadget/function/f_mass_storage.c between commit: dc9217b69dd6 ("usb: gadget: f_mass_storage: Serialize wake and sleep execution") from Linus' tree and commit: 225785aec726 ("USB: f_mass_storage: i

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

2014-09-08 Thread Felipe Balbi
On Mon, Sep 08, 2014 at 05:13:11PM +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 > Linus'

linux-next: manual merge of the usb-gadget tree with Linus' tree

2014-09-08 Thread Stephen Rothwell
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 Linus' tree and commit ea2fdf842365 ("usb: phy: samsung: remove old common USB PHY co

linux-next: manual merge of the usb-gadget tree with Linus' tree

2014-09-08 Thread Stephen Rothwell
Hi Felipe, Today's linux-next merge of the usb-gadget tree got conflicts in drivers/usb/gadget/Makefile, drivers/usb/gadget/legacy/Makefile and drivers/usb/gadget/function/Makefile between commit 5d19703822da ("usb: gadget: remove $(PWD) in ccflags-y") from Linus' tree and commit fa31409a82ee ("us

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

2014-07-17 Thread Felipe Balbi
On Thu, Jul 17, 2014 at 04:52:38PM +1000, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > include/uapi/linux/usb/functionfs.h between commit 091221417853 ("usb: > gadget: f_fs: resurect usb_functionfs_descs_head structure") from > Linus'

linux-next: manual merge of the usb-gadget tree with Linus' tree

2014-07-16 Thread Stephen Rothwell
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in include/uapi/linux/usb/functionfs.h between commit 091221417853 ("usb: gadget: f_fs: resurect usb_functionfs_descs_head structure") from Linus' tree and commit f0175ab51993 ("usb: gadget: f_fs: OS descriptors support") fr

linux-next: manual merge of the usb-gadget tree with Linus' tree

2013-07-31 Thread Stephen Rothwell
Hi Felipe, Today's linux-next merge of the usb-gadget tree got conflicts in drivers/usb/musb/omap2430.c and drivers/usb/musb/tusb6010.c between commit c1f01be4060b ("usb: musb: fix resource passed from glue layer to musb") from Linus' tree and commit c1a7d67c1901 ("usb: musb: use dev_get_platdata(