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
> usb.current tree and commit c36cbfc045bf ("usb: gadget: net2272: remove
> unused DMA_ADDR_INVALID") from the usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/usb/gadget/net2272.c
> index 32524b63,03e4104..0000000
> --- a/drivers/usb/gadget/net2272.c
> +++ b/drivers/usb/gadget/net2272.c
> @@@ -58,8 -58,7 +58,7 @@@ static const char * const ep_name[] = 
>   	"ep-a", "ep-b", "ep-c",
>   };
>   
> - #define DMA_ADDR_INVALID	(~(dma_addr_t)0)
>  -#ifdef CONFIG_USB_GADGET_NET2272_DMA
>  +#ifdef CONFIG_USB_NET2272_DMA

Resolution is correct, thanks Stephen.

-- 
balbi