From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Randy Dunlap <rdunlap@xenotime.net>
Cc: netdev@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>,
linux-kernel@vger.kernel.org, David Miller <davem@davemloft.net>,
Stephane Grosjean <s.grosjean@peak-system.com>,
Wolfgang Grandegger <wg@grandegger.com>,
linux-can@vger.kernel.org
Subject: Re: [PATCH] net/can: rename peak_usb dump_mem function
Date: Fri, 21 Sep 2012 23:52:28 +0200 [thread overview]
Message-ID: <505CE19C.6030205@pengutronix.de> (raw)
In-Reply-To: <505CDF3F.6040009@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]
On 09/21/2012 11:42 PM, Randy Dunlap wrote:
> On 09/02/2012 10:13 AM, Randy Dunlap wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Rename generic-sounding function dump_mem() to pcan_dump_mem()
>> so that it does not conflict with the dump_mem() function in
>> arch/sh/include/asm/kdebug.h.
>>
>> drivers/net/can/usb/peak_usb/pcan_usb_core.c: error: conflicting types for 'dump_mem': => 56:6
>> drivers/net/can/usb/peak_usb/pcan_usb_core.h: error: conflicting types for 'dump_mem': => 134:6
>>
>> Not tested.
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> Cc: Stephane Grosjean <s.grosjean@peak-system.com>
>> Cc: Wolfgang Grandegger <wg@grandegger.com>
>> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
>
>
> ping.
The patch is already part of can-next and will be included in the next
pull request to David.
regards, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
prev parent reply other threads:[~2012-09-21 21:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1346577700-8156-1-git-send-email-geert@linux-m68k.org>
2012-09-02 17:13 ` [PATCH] net/can: rename peak_usb dump_mem function Randy Dunlap
2012-09-03 9:02 ` Marc Kleine-Budde
2012-09-21 21:42 ` Randy Dunlap
2012-09-21 21:52 ` Marc Kleine-Budde [this message]
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=505CE19C.6030205@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=s.grosjean@peak-system.com \
--cc=wg@grandegger.com \
/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;
as well as URLs for NNTP newsgroup(s).