linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: torvalds@transmeta.com, linux-kernel@vger.kernel.org, netdev@oss.sgi.com
Subject: [BK PATCHES] net driver merges
Date: Thu, 19 Jun 2003 23:46:26 -0400	[thread overview]
Message-ID: <20030620034626.GA3366@gtf.org> (raw)


Linus, please do a

	bk pull bk://kernel.bkbits.net/jgarzik/net-drivers-2.5

Others may download the patch from

ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.5/2.5.72-bk2-netdrvr1.patch.bz2

This will update the following files:

 drivers/net/amd8111e.c          |   12 +++--
 drivers/net/bonding/bond_main.c |   88 +++------------------------------------
 drivers/net/ixgb/ixgb_ethtool.c |    1 
 drivers/net/pcmcia/xirc2ps_cs.c |   89 ++++++++++++++++------------------------
 drivers/net/pcnet32.c           |    2 
 drivers/net/sis900.c            |    1 
 drivers/net/tulip/Kconfig       |    2 
 7 files changed, 54 insertions(+), 141 deletions(-)

through these ChangeSets:

<mikpe@csd.uu.se> (03/06/19 1.1366)
   [netdrvr tulip] Kconfig help text fix
   
   While there is a separate driver for 2104x tulips (CONFIG_DE2104X),
   drivers/net/tulip/Kconfig states that CONFIG_TULIP also supports
   2104x tulips. This is not the case since that support was removed
   in December 2001. A user with an old tulip may thus be tricked into
   configuring the wrong driver. (I was, on my PMac 4400.)
   
   The patch below removes this misinformation from tulip's Kconfig.
   

<jgarzik@redhat.com> (03/06/19 1.1365)
   [netdrvr sis900] add new phy id to phy table
   
   (pulled change from 2.4)

<daniel.ritz@gmx.ch> (03/06/19 1.1364)
   [PATCH] xirc2ps_cs update
   
   the second patch:
   replaces busy_loop with a simple macro doing a schedule_timeout. busy_loop was never
   called from interrupt conext anyway, so no need for that. and the sti() is gone.
   
   rgds
   -daniel

<daniel.ritz@gmx.ch> (03/06/19 1.1363)
   [PATCH] xirc2ps_cs update
   
   hi
   
   this patch does:
   - net_device is no longer allocated as part of the driver's private structure,
     instead it's allocated via alloc_netdev
   - xirc2ps_detach calls xirc2ps_release if necessary (like the other drivers)
   
   against 2.5.70-bk.
   
   rgds
   -daniel

<zwane@linuxpower.ca> (03/06/19 1.1362)
   [PATCH] Remove warning due to comparison in drivers/net/pcnet32.c
   
   drivers/net/pcnet32.c: In function `pcnet32_init_ring':
   drivers/net/pcnet32.c:1006: warning: comparison between pointer and integer

<bunk@fs.tum.de> (03/06/19 1.1361)
   [netdrvr ixgb] fix clash with newly-updated ethtool.h

<reeja.john@amd.com> (03/06/19 1.1360)
   [netdrvr amd8111e] fix spinlock recursion / if close failure

<ak@muc.de> (03/06/19 1.1359)
   [PATCH] Remove copied inet_aton code in bond_main.c
   
   According to a report the my_inet_aton code in bond_main.c is copied
   from 4.4BSD, but it doesn't carry a BSD copyright license. In addition
   it is somewhat redundant with the standard in_aton.  Convert it
   to use the linux function.
   
   Error handling is a bit worse than before, but not much.
   
   Patch for 2.5 bonding. The 2.4 version has the same problem, but afaik
   it is scheduled to be replaced by the 2.5 codebase anyways.
   
   -Andi


             reply	other threads:[~2003-06-20  3:32 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-06-20  3:46 Jeff Garzik [this message]
  -- strict thread matches above, loose matches on Subject: below --
2003-07-08 23:26 [BK PATCHES] net driver merges Jeff Garzik
2003-06-24  2:32 Jeff Garzik
2003-06-06  5:42 Jeff Garzik
2003-05-29 21:10 Jeff Garzik
2003-05-27  5:55 Jeff Garzik
2003-05-26  0:26 Jeff Garzik
2003-05-11 18:36 [BK+PATCHES] " Jeff Garzik
2003-04-28  4:55 [BK PATCHES] " Jeff Garzik
2003-04-28  7:22 ` Aaron Lehmann
2003-04-28 13:40   ` Jeff Garzik
2003-04-26  4:17 Jeff Garzik
2003-03-29  5:46 Jeff Garzik
2003-03-22 22:27 Jeff Garzik
2003-01-04  0:02 Jeff Garzik
2003-01-04  1:27 ` Jeff Garzik
2002-02-09  0:25 Jeff Garzik

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=20030620034626.GA3366@gtf.org \
    --to=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@oss.sgi.com \
    --cc=torvalds@transmeta.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).