From: David Miller <davem@davemloft.net>
To: romieu@fr.zoreil.com
Cc: netdev@vger.kernel.org, gallatin@myri.com, andy@greyhouse.net,
chris.snook@gmail.com, venza@brownhat.org,
DavidLv@viatech.com.cn, grantgrundler@gmail.com,
ionut@badula.org, jcliburn@gmail.com, jdmason@kudzu.us,
mason@myri.com, mchan@broadcom.com, stas.yakovlev@gmail.com,
steve.glendinning@smsc.com, thockin@hockin.org
Subject: Re: Pull request for 'davem-next.base_addr.removal' branch
Date: Sat, 07 Apr 2012 09:28:35 -0400 (EDT) [thread overview]
Message-ID: <20120407.092835.1375353252765830240.davem@davemloft.net> (raw)
In-Reply-To: <20120407.085012.658444364459389098.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Sat, 07 Apr 2012 08:50:12 -0400 (EDT)
> From: Francois Romieu <romieu@fr.zoreil.com>
> Date: Sat, 7 Apr 2012 12:20:51 +0200
>
>> Please pull from branch 'davem-next.base_addr.removal' in repository
>>
>> git://violet.fr.zoreil.com/romieu/linux davem-next.base_addr.removal
>>
>> to get the changes below.
>
> Pulled, thanks for doing this work Francois.
I had to add the following patch to fix a warning:
--------------------
fealnx: Remove unused local label 'out' in netdev_open().
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/fealnx.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 6f939a1..9d71c9c 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -923,7 +923,6 @@ static int netdev_open(struct net_device *dev)
np->reset_timer.data = (unsigned long) dev;
np->reset_timer.function = reset_timer;
np->reset_timer_armed = 0;
-out:
return rc;
}
--
1.7.7.6
prev parent reply other threads:[~2012-04-07 13:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-07 10:20 Pull request for 'davem-next.base_addr.removal' branch Francois Romieu
2012-04-07 12:50 ` David Miller
2012-04-07 13:28 ` David Miller [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=20120407.092835.1375353252765830240.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=DavidLv@viatech.com.cn \
--cc=andy@greyhouse.net \
--cc=chris.snook@gmail.com \
--cc=gallatin@myri.com \
--cc=grantgrundler@gmail.com \
--cc=ionut@badula.org \
--cc=jcliburn@gmail.com \
--cc=jdmason@kudzu.us \
--cc=mason@myri.com \
--cc=mchan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=romieu@fr.zoreil.com \
--cc=stas.yakovlev@gmail.com \
--cc=steve.glendinning@smsc.com \
--cc=thockin@hockin.org \
--cc=venza@brownhat.org \
/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).