Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_core.c between commit da96cfc13335 ("usb: musb:
fix order of conditions for assigning end point operations") from the
usb.current tree and commit 47a82730b54c ("usb: musb: Fix platform code
being
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_core.c between commit da96cfc13335 (usb: musb:
fix order of conditions for assigning end point operations) from the
usb.current tree and commit 47a82730b54c (usb: musb: Fix platform code
being
Hi,
> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Friday, January 16, 2015 7:24 AM
> To: Felipe Balbi; Greg KH
> Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Robert Baldyga;
> Kaukab, Yousaf
> Subject: lin
Hi,
-Original Message-
From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
Sent: Friday, January 16, 2015 7:24 AM
To: Felipe Balbi; Greg KH
Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Robert Baldyga;
Kaukab, Yousaf
Subject: linux-next: manual merge of the usb
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
usb.current tree and commit c6f5c050e2a7 ("usb: dwc2: gadget: add
bi-directional
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 (usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()) from the
usb.current tree and commit c6f5c050e2a7 (usb: dwc2: gadget: add
bi-directional
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/bdc/bdc_ep.c between commit f26d29e34e20 ("usb:
gadget: udc: avoid dereference before NULL check in ep_queue") from the
usb.current tree and commit d71b0d7764a7 ("usb: gadget: udc: remove
bogus
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
usb.current tree and commit 6b448af46e2a ("drivers: usb: dwc2: remove
'force'
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 (usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()) from the
usb.current tree and commit 6b448af46e2a (drivers: usb: dwc2: remove
'force'
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/bdc/bdc_ep.c between commit f26d29e34e20 (usb:
gadget: udc: avoid dereference before NULL check in ep_queue) from the
usb.current tree and commit d71b0d7764a7 (usb: gadget: udc: remove
bogus NULL
On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
> 36687e305651 ("doc: dt: mxs-phy: add compatible string for
> imx6sx-usbphy")
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mxs-usb.c between commit 43f3634ff7e2 ("usb: phy:
mxs: add imx6sx support") from the usb.current tree and commit
d0ee68b59e6a ("usb: phy: mxs: Add VF610 USB PHY support") from the
usb-gadget tree.
I
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
36687e305651 ("doc: dt: mxs-phy: add compatible string for
imx6sx-usbphy") from the usb.current tree and commit d0ee68b59e6a
("usb: phy: mxs: Add VF610 USB
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
36687e305651 (doc: dt: mxs-phy: add compatible string for
imx6sx-usbphy) from the usb.current tree and commit d0ee68b59e6a
(usb: phy: mxs: Add VF610 USB
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mxs-usb.c between commit 43f3634ff7e2 (usb: phy:
mxs: add imx6sx support) from the usb.current tree and commit
d0ee68b59e6a (usb: phy: mxs: Add VF610 USB PHY support) from the
usb-gadget tree.
I
On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote:
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
36687e305651 (doc: dt: mxs-phy: add compatible string for
imx6sx-usbphy) from the
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_cppi41.c between commit c58d80f523ff ("usb: musb:
Ensure that cppi41 timer gets armed on premature DMA TX irq") from the
usb.current tree and commit 50aea6fca771 ("usb: musb: cppi41: fire
hrtimer
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_cppi41.c between commit c58d80f523ff (usb: musb:
Ensure that cppi41 timer gets armed on premature DMA TX irq) from the
usb.current tree and commit 50aea6fca771 (usb: musb: cppi41: fire
hrtimer
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/Kconfig between commit 7cd0c298f6e0 ("usb: phy: fix
driver dependencies") from the usb.current tree and commit e1d2e31975e1
("usb: phy: Add OTG FSM configuration option") from the usb-gadget tree.
I
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/Kconfig between commit 7cd0c298f6e0 (usb: phy: fix
driver dependencies) from the usb.current tree and commit e1d2e31975e1
(usb: phy: Add OTG FSM configuration option) from the usb-gadget tree.
I fixed it
Hi,
On Tue, Jul 30, 2013 at 02:08:10PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget:
> udc-core: fix the typo of udc state attribute") from the
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget:
udc-core: fix the typo of udc state attribute") from the usb.current tree
and commit 5702f75375aa ("usb: gadget: udc-core: move sysfs_notify() to a
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 (usb: gadget:
udc-core: fix the typo of udc state attribute) from the usb.current tree
and commit 5702f75375aa (usb: gadget: udc-core: move sysfs_notify() to a
Hi,
On Tue, Jul 30, 2013 at 02:08:10PM +1000, Stephen Rothwell wrote:
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 (usb: gadget:
udc-core: fix the typo of udc state attribute) from the usb.current tree
On Fri, Mar 22, 2013 at 02:31:35PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
> net2280: remove leftover driver->unbind call in error pathway") from the
Hi,
On Fri, Mar 22, 2013 at 02:28:11PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/net2272.c between commit eda81bea894e ("usb: gadget:
> net2272: finally convert "CONFIG_USB_GADGET_NET2272_DMA"") from the
Hi,
On Fri, Mar 22, 2013 at 02:28:11PM +1100, Stephen Rothwell wrote:
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2272.c between commit eda81bea894e (usb: gadget:
net2272: finally convert CONFIG_USB_GADGET_NET2272_DMA) from the
On Fri, Mar 22, 2013 at 02:31:35PM +1100, Stephen Rothwell wrote:
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 (USB: gadget:
net2280: remove leftover driver-unbind call in error pathway) from the
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
net2280: remove leftover driver->unbind call in error pathway") from the
usb.current tree and commit 68abc94f8de8 ("usb: gadget: net2280: don't
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2272.c between commit eda81bea894e ("usb: gadget:
net2272: finally convert "CONFIG_USB_GADGET_NET2272_DMA"") from the
usb.current tree and commit c36cbfc045bf ("usb: gadget: net2272: remove
unused
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2272.c between commit eda81bea894e (usb: gadget:
net2272: finally convert CONFIG_USB_GADGET_NET2272_DMA) from the
usb.current tree and commit c36cbfc045bf (usb: gadget: net2272: remove
unused
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 (USB: gadget:
net2280: remove leftover driver-unbind call in error pathway) from the
usb.current tree and commit 68abc94f8de8 (usb: gadget: net2280: don't
touch
32 matches
Mail list logo
