From: Felipe Balbi <balbi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Paul Bolle <pebolle@tiscali.nl>,
Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Fri, 22 Mar 2013 08:28:29 +0200 [thread overview]
Message-ID: <20130322062829.GA21346@arwen.pp.htv.fi> (raw)
In-Reply-To: <20130322142811.41c24edf17de8c6809da5224@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-03-22 6:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 3:28 linux-next: manual merge of the usb-gadget tree with the usb.current tree Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-22 3:31 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
2013-07-30 4:08 Stephen Rothwell
2013-07-30 5:50 ` Felipe Balbi
2013-12-18 6:09 Stephen Rothwell
2014-07-04 4:51 Stephen Rothwell
2014-09-08 7:02 Stephen Rothwell
2014-09-08 13:27 ` Felipe Balbi
2014-09-08 7:09 Stephen Rothwell
2015-01-13 4:02 Stephen Rothwell
2015-01-13 4:06 Stephen Rothwell
2015-01-16 6:23 Stephen Rothwell
2015-01-16 9:56 ` Kaukab, Yousaf
2015-05-28 8:36 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130322062829.GA21346@arwen.pp.htv.fi \
--to=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox