Hi all,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/cdns3/gadget.c
between commit:
e9010320f2d9 ("usb: cdns3: gadget: make a bunch of functions static")
from the usb tree and commit:
e2e77a94078b ("usb: cdns3: mark local functions static")
from the us
On Thu, May 17, 2018 at 02:03:18PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
> drivers/usb/mtu3/Kconfig
>
> between commit:
>
> cd91a0e9d38f ("usb: Remove depends on HAS_DMA in case of platform
> dependency")
>
> from
Hi all,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/mtu3/Kconfig
between commit:
cd91a0e9d38f ("usb: Remove depends on HAS_DMA in case of platform dependency")
from the usb tree and commit:
f39846824cd6 ("usb: mtu3: make USB_MTU3_DUAL_ROLE depend on EX
Hi,
Kees Cook writes:
> On Wed, Oct 18, 2017 at 7:42 AM, Mark Brown wrote:
>> Hi Felipe,
>>
>> Today's linux-next merge of the usb-gadget tree got a conflict in:
>>
>> drivers/usb/gadget/udc/snps_udc_core.c
>>
>> between commit:
>>
>> 29bce57723351f63d ("usb/gadget/snps_udc_core: Convert ti
On Wed, Oct 18, 2017 at 08:40:04AM -0700, Kees Cook wrote:
> On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown wrote:
> > I fixed it up with the USB version and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned
On Wed, Oct 18, 2017 at 7:42 AM, Mark Brown wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
> drivers/usb/gadget/udc/snps_udc_core.c
>
> between commit:
>
> 29bce57723351f63d ("usb/gadget/snps_udc_core: Convert timers to use
> timer_setup()")
>
> f
On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
> drivers/usb/phy/phy-isp1301-omap.c
>
> between commit:
>
> 4c13fec1ba55595 ("usb: isp1301-omap: Convert timers to use timer_setup()")
>
> from the usb tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/phy/phy-isp1301-omap.c
between commit:
4c13fec1ba55595 ("usb: isp1301-omap: Convert timers to use timer_setup()")
from the usb tree and commit:
687f272c6b0e89d ("usb: phy: omap: use setup_timer() h
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/gadget/udc/snps_udc_core.c
between commit:
29bce57723351f63d ("usb/gadget/snps_udc_core: Convert timers to use
timer_setup()")
from the usb tree and commit:
46b614affda8667f9 ("usb: gadget: udc: s
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/gadget/udc/amd5536udc.c
between commit:
b5a6a4e5baef ("usb: gadget: amd5536udc: Replace PCI pool old API")
from the usb tree and commit:
7bf80fcd797f ("usb: gadget: udc: avoid use of freed pointer"
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got conflicts in:
drivers/usb/gadget/udc/Kconfig
between commit:
2c93e790e825 ("usb: add CONFIG_USB_PCI for system have both PCI HW and
non-PCI based USB HW")
from the usb tree and commit:
5dbc49aebd0a ("usb: gadget: udc: amd55
On Thu, Nov 06, 2014 at 02:58:32PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/chipidea/otg_fsm.c between commit 51f1741fcc16 ("usb:
> chipidea: otg_fsm: delete unnecessary 'out of memory' messages") from
> the usb
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/chipidea/otg_fsm.c between commit 51f1741fcc16 ("usb:
chipidea: otg_fsm: delete unnecessary 'out of memory' messages") from
the usb tree and commit ef44cb4226d1 ("usb: allow to supply the PHY in
the drivers wh
On Mon, Apr 28, 2014 at 03:20:44PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-mv-u3d-usb.c between commit 543cab640279 ("usb: phy:
> mv_u3d: Remove usb phy driver for mv_u3d") from the usb tree and commit
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mv-u3d-usb.c between commit 543cab640279 ("usb: phy:
mv_u3d: Remove usb phy driver for mv_u3d") from the usb tree and commit
041832565e40 ("usb: phy: mv-u3d: switch over to writel/readl") from the
usb-
Hi,
On Fri, Aug 02, 2013 at 04:38:18PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host:
> use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb:
> tegra: ho
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host:
use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb:
tegra: host: Remove references to plat data") from the usb-gadget tree.
I f
On Thu, Apr 04, 2013 at 08:27:30AM +0200, Thierry Reding wrote:
> On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote:
> > Hi Felipe,
> >
> > Today's linux-next merge of the usb-gadget tree got a conflict in
> > drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
>
On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
> ehci-tegra: Fix oops in error cleanup") from the usb tree and commit
> 426
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
ehci-tegra: Fix oops in error cleanup") from the usb tree and commit
4261b8f3538c ("usb: host: ehci-tegra: fix PHY error handling") from the
usb-gadge
20 matches
Mail list logo
