* linux-next: manual merge of the usb-gadget tree
@ 2013-10-10 21:20 Mark Brown
2013-10-10 21:26 ` Felipe Balbi
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2013-10-10 21:20 UTC (permalink / raw)
To: Russell King, Sergei Shtylyov, Felipe Balbi
Cc: linux-usb, linux-next, linux-kernel, Thierry Reding
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/musb/davinci.c caused by an add in ea78201e2 (usb: musb:
davinci: fix resources passed to MUSB driver for DM6467) adjacent to
the modification of the device registration in 4c9ad1059 (DMA-API: usb:
musb: use platform_device_register_full() to avoid directly messing with
dma masks) from the ARM tree.
I've fixed trivially and can carry as required.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the usb-gadget tree
2013-10-10 21:20 linux-next: manual merge of the usb-gadget tree Mark Brown
@ 2013-10-10 21:26 ` Felipe Balbi
0 siblings, 0 replies; 2+ messages in thread
From: Felipe Balbi @ 2013-10-10 21:26 UTC (permalink / raw)
To: Mark Brown
Cc: Russell King, Sergei Shtylyov, Felipe Balbi, linux-usb,
linux-next, linux-kernel, Thierry Reding
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Hi,
On Thu, Oct 10, 2013 at 10:20:30PM +0100, Mark Brown wrote:
> Today's linux-next merge of the usb-gadget tree got conflicts in
> drivers/usb/musb/davinci.c caused by an add in ea78201e2 (usb: musb:
> davinci: fix resources passed to MUSB driver for DM6467) adjacent to
> the modification of the device registration in 4c9ad1059 (DMA-API: usb:
> musb: use platform_device_register_full() to avoid directly messing with
> dma masks) from the ARM tree.
>
> I've fixed trivially and can carry as required.
Thank you.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-10 21:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-10 21:20 linux-next: manual merge of the usb-gadget tree Mark Brown
2013-10-10 21:26 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox