commit 254feb882a7c6e4e51416dff6a97d847fbbba551
tree ad2516671b031a8e0b3f9a656a16c13c3f03d61c
parent 8aadff7dd519800ce7c0e7fb75dcd4438b373134
parent 66f5507133f97088e553b1c8f8d341a0efd438f9
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 09:26:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 09:26:10 -0700

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/hch/xfs-2.6

commit 9920e91450ee9b373dd4924f79d287a267b8f6a3
tree 01d10ce3eb86ff5891c6bd538c095f158698476f
parent 25be5e6ccc5c9cab77012fabbb72520f9b6e4618
author Alexander Nyberg <alexn@telia.com> Fri, 27 May 2005 12:27:05 +0200
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 08:15:05 -0700

    [PATCH] Fixup VIA IRQ quirk

    quirk_via_irqpic can't be __devinit for swsuspend

    Signed-off-by: Alexander Nyberg <alexn@telia.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8aadff7dd519800ce7c0e7fb75dcd4438b373134
tree abcd2112cb4554a76588e876e9007cdb380a2c3e
parent 3e11c3ce0a4ce3d30802babccb0e5f881778ccf1
author Alexander Nyberg <alexn@telia.com> Fri, 27 May 2005 12:48:50 +0200
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 08:15:05 -0700

    [PATCH] Note on ACPI build fix

    Even after the previous fix you can still set CONFIG_ACPI_BOOT
    indirectly even without CONFIG_ACPI by choosing CONFIG_PCI and
    CONFIG_PCI_MMCONFIG.

    That doesn't build very well either.

    This makes PCI_MMCONFIG depend on ACPI, fixing that hole.

    [ I guess in theory Kconfig could follow the whole chain of dependencies
      for things that get selected, but that sounds insanely complicated, so
      we'll just fix up these things by hand.  --Linus ]

    Signed-off-by: Alexander Nyberg <alexn@telia.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 3e11c3ce0a4ce3d30802babccb0e5f881778ccf1
tree 5dfea042e20045f05c9e2660ef04d228968156e0
parent 9920e91450ee9b373dd4924f79d287a267b8f6a3
author Len Brown <lenb@toshiba.hsd1.ma.comcast.net> Fri, 27 May 2005 04:53:27 -0400
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 08:15:05 -0700

    [PATCH] ACPI build fix

    Fix 2.6.12 CONFIG_ACPI=n build regression.
    CONFIG_ACPI_BOOT shall be set only if CONFIG_ACPI.

    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 25be5e6ccc5c9cab77012fabbb72520f9b6e4618
tree 4c1b48179d7f18b3e037a473d8e04708b619ac5c
parent 2efe86b809d97debaaf9fcc13b041aedf15bd3d2
author Len Brown <lenb@toshiba.hsd1.ma.comcast.net> Fri, 27 May 2005 04:21:50 -0400
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 08:15:04 -0700

    [PATCH] VIA IRQ quirk

    Delete quirk_via_bridge(), restore quirk_via_irqpic() -- but now
    improved to be invoked upon device ENABLE, and now only for VIA devices
    -- not all devices behind VIA bridges.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 2efe86b809d97debaaf9fcc13b041aedf15bd3d2
tree 87e039397918f4c5b0a21d798589a8ce517bfa2d
parent 88c1834633341bbb94e315433067496338bff4ad
author Paul Jackson <pj@sgi.com> Fri, 27 May 2005 02:02:43 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 08:07:26 -0700

    [PATCH] cpuset exit NULL dereference fix

    There is a race in the kernel cpuset code, between the code
    to handle notify_on_release, and the code to remove a cpuset.
    The notify_on_release code can end up trying to access a
    cpuset that has been removed.  In the most common case, this
    causes a NULL pointer dereference from the routine cpuset_path.
    However all manner of bad things are possible, in theory at least.

    The existing code decrements the cpuset use count, and if the
    count goes to zero, processes the notify_on_release request,
    if appropriate.  However, once the count goes to zero, unless we
    are holding the global cpuset_sem semaphore, there is nothing to
    stop another task from immediately removing the cpuset entirely,
    and recycling its memory.

    The obvious fix would be to always hold the cpuset_sem
    semaphore while decrementing the use count and dealing with
    notify_on_release.  However we don't want to force a global
    semaphore into the mainline task exit path, as that might create
    a scaling problem.

    The actual fix is almost as easy - since this is only an issue
    for cpusets using notify_on_release, which the top level big
    cpusets don't normally need to use, only take the cpuset_sem
    for cpusets using notify_on_release.

    This code has been run for hours without a hiccup, while running
    a cpuset create/destroy stress test that could crash the existing
    kernel in seconds.  This patch applies to the current -linus
    git kernel.

    Signed-off-by: Paul Jackson <pj@sgi.com>
    Acked-by: Simon Derr <simon.derr@bull.net>
    Acked-by: Dinakar Guniguntala <dino@in.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 88c1834633341bbb94e315433067496338bff4ad
tree 4ec40e39b38d768866fabc0dec7f9c4cfdc4b02d
parent 5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4
author Alan Cox <alan@lxorguk.ukuu.org.uk> Fri, 27 May 2005 13:40:53 +0100
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 07:45:21 -0700

    [PATCH] remove non-cleanroom pwc driver compression

    The original pwc author raised some questions about the reverse
    engineering of the decompressor algorithms used in the pwc driver.
    Having done some detailed investigation it appears those concerns that
    clean room policy was not followed are reasonable.  I've also had a
    friendly discussion with Philips to ask their view on this.

    This removes the problem items of code which reduces the pwc
    functionality in the kernel a little but leaves all the framework for
    setup that will be needed for decompressors in user space (where they
    eventually belong).  This change set is designed to be the minimal risk
    change set given that 2.6.12 is hopefully close to hand, with a view to
    merging the much updated pwc code in 2.6.13 series kernels.

    Someone else can then redo the decompressors properly (clean room) in
    user space.

    Note that while its easy to say that it should have been caught earlier,
    but the violation was really only obvious to someone who had access to
    both the proprietary source and the 'GPL' source.

commit 5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4
tree 1ffe2c5546d3891f72f4235a788240a520a2db02
parent d68b8622ccbee8a18e495ad1650c3306f2eeb0d6
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 07:36:17 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 27 May 2005 07:36:17 -0700

    ide-cd: revert DMA mask test change

    The change to require the DMA length to be only word-aligned was not
    safe.

commit 66f5507133f97088e553b1c8f8d341a0efd438f9
tree fbf1ca5377bc37704eb9d427e058e64ef52a99ec
parent b19312c4c8f3f84da57bba01d45549df1cf10dcd
author Christoph Hellwig <hch@hera.kernel.org> Fri, 27 May 2005 01:17:08 -0700
committer Christoph Hellwig <hch@melbourne.sgi.com> Fri, 27 May 2005 01:17:08 -0700

    [XFS] remove an over-zealous WARN_ON

commit b19312c4c8f3f84da57bba01d45549df1cf10dcd
tree 1c34ce89be6b4e257bc03026d0268deb17727044
parent d3870398fafd4911bd84573b78be4b6b762f32b0
parent 4ec5240ec367a592834385893200dd4fb369354c
author Christoph Hellwig <hch@hera.kernel.org> Fri, 27 May 2005 01:16:24 -0700
committer Christoph Hellwig <hch@melbourne.sgi.com> Fri, 27 May 2005 01:16:24 -0700

    Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git


commit d68b8622ccbee8a18e495ad1650c3306f2eeb0d6
tree 7ec334394d78055de4d085c354c2931390c229f0
parent 4ec5240ec367a592834385893200dd4fb369354c
author Roland McGrath <roland@redhat.com> Thu, 26 May 2005 15:21:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 16:16:16 -0700

    [PATCH] i386: fix prevent_tail_call

    We fixed this bug before, but it didn't take.  It may have been the case
    that the problem was first noticed to occur in a CONFIG_REGPARM compile.
    But it's not regparm functions that need not to make tail calls, it's
    asmlinkage functions called with a user pt_regs frame on the stack
    supplying their arguments.  prevent_tail_call probably doesn't do anything
    at all in regparm functions (your argument registers are going to be
    clobbered, period).  It was a braino to conditionalize that definition in
    the first place.

    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 4ec5240ec367a592834385893200dd4fb369354c
tree 3ac9a34948049bff79a2b2ce49c0a3c84e35a748
parent f49809fe9b39e22b0f6f75c86295ce216ce3e374
parent b6016b767397258b58163494a869f8f1199e6897
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 13:54:33 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 13:54:33 -0700

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

commit b6016b767397258b58163494a869f8f1199e6897
tree cd0bc87ff25ceaa1dd55860c9f212e18bb5a9f08
parent c8b35d2a29ec3c93e3b9c1e70d649a77a214b1c1
author Michael Chan <mchan@broadcom.com> Thu, 26 May 2005 13:03:09 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 13:03:09 -0700

    [BNX2]: New Broadcom gigabit network driver.

    A new driver bnx2 for Broadcom bcm5706 is available.

    The patch also includes new 1000BASE-X advertisement bit definitions in
    mii.h

    Thanks to David Miller and Jeff Garzik for reviewing and their valuable
    feedback.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c8b35d2a29ec3c93e3b9c1e70d649a77a214b1c1
tree cbfd8aa83c964984bc6ffd0f3559d711f157bc40
parent c6b3365391c626206f6789354794a81a010cb7a1
author Alexey Dobriyan <adobriyan@gmail.com> Thu, 26 May 2005 12:59:42 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:59:42 -0700

    [TOKENRING]: net/802/tr.c: s/struct rif_cache_s/struct rif_cache/

    "_s" suffix is certainly of hungarian origin.

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c6b3365391c626206f6789354794a81a010cb7a1
tree da574716500222ef1a7c4c66d1891ba1c4d8fd95
parent 92d63decc0b6a5d600f792fcf5f3ff9718c09a3d
author Alexey Dobriyan <adobriyan@gmail.com> Thu, 26 May 2005 12:59:05 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:59:05 -0700

    [TOKENRING]: be'ify trh_hdr, trllc, rif_cache_s

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 92d63decc0b6a5d600f792fcf5f3ff9718c09a3d
tree eca15d3ffba7795ea4d9bef9cdc6d21c7c71fa00
parent 2f872f0401d4b470990864fbf99c19130f25ad4d
author Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Thu, 26 May 2005 12:58:04 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:58:04 -0700

    From: Kazunori Miyazawa <kazunori@miyazawa.org>

    [XFRM] Call dst_check() with appropriate cookie

    This fixes infinite loop issue with IPv6 tunnel mode.

    Signed-off-by: Kazunori Miyazawa <kazunori@miyazawa.org>
    Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2f872f0401d4b470990864fbf99c19130f25ad4d
tree 715de6e359e359321df14fe5d21c9d50076be761
parent 0dca51d362b8e4af6b0dbc9e54d1e5165341918a
author Jay Vosburgh <fubar@us.ibm.com> Thu, 26 May 2005 12:56:59 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:56:59 -0700

    [BONDING]: bonding using arp_ip_target may stay down with active path 

    Correcting the list traversal makes the problem go away.

    Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0dca51d362b8e4af6b0dbc9e54d1e5165341918a
tree ba19c8dc5601362fdd36c1c4f86f6246d9ed6564
parent 0f9f32ac65ee4a452a912a8440cebbc4dff73852
author Stephen Hemminger <shemminger@osdl.org> Thu, 26 May 2005 12:55:48 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:55:48 -0700

    [PKT_SCHED] netem: allow random reordering (with fix)

    Here is a fixed up version of the reorder feature of netem.
    It is the same as the earlier patch plus with the bugfix from Julio merged in.
    Has expected backwards compatibility behaviour.

    Go ahead and merge this one, the TCP strangeness I was seeing was due
    to the reordering bug, and previous version of TSO patch.

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0f9f32ac65ee4a452a912a8440cebbc4dff73852
tree 86e8a90e0baad0fe22e2b354ef64562af61c2c87
parent 0afb51e72855971dba83b3c6b70c547c2d1161fd
author Stephen Hemminger <shemminger@osdl.org> Thu, 26 May 2005 12:55:01 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:55:01 -0700

    [PKT_SCHED] netem: use only inner qdisc -- no private skbuff queue

    Netem works better if there if packets are just queued in the inner discipline
    rather than having a separate delayed queue. Change to use the dequeue/requeue
    to peek like TBF does.

    By doing this potential qlen problems with the old method are avoided. The problems
    happened when the netem_run that moved packets from the inner discipline to the nested
    discipline failed (because inner queue was full). This happened in dequeue, so the
    effective qlen of the netem would be decreased (because of the drop), but there was
    no way to keep the outer qdisc (caller of netem dequeue) in sync.

    The problem window is still there since this patch doesn't address the issue of
    requeue failing in netem_dequeue, but that shouldn't happen since the sequence dequeue/requeue
    should always work.  Long term correct fix is to implement qdisc->peek in all the qdisc's
    to allow for this (needed by several other qdisc's as well).

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0afb51e72855971dba83b3c6b70c547c2d1161fd
tree 8f0e3cd40e381f4dd9de2e7431490ae8cbbf6498
parent cdbbde14cb55dd10771ce79154f787322d88411b
author Stephen Hemminger <shemminger@osdl.org> Thu, 26 May 2005 12:53:49 -0700
committer David S. Miller <davem@davemloft.net> Thu, 26 May 2005 12:53:49 -0700

    [PKT_SCHED]: netem: reinsert for duplication

    Handle duplication of packets in netem by re-inserting at top of qdisc tree.
    This avoid problems with qlen accounting with nested qdisc. This recursion
    requires no additional locking but will potentially increase stack depth.

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f49809fe9b39e22b0f6f75c86295ce216ce3e374
tree 05f8c05ee71307c9ab02663cfaa5f08a21c6629f
parent cdbbde14cb55dd10771ce79154f787322d88411b
parent c1ef1f351db70ad60c793b8218dd9f6739cfd66d
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 10:27:39 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 10:27:39 -0700

    Automatic merge of 'for-linus' branch from

    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit cdbbde14cb55dd10771ce79154f787322d88411b
tree d9b0f1f1a16e7c3d2fb656f794826aa3b37e7628
parent 284e423811495f632a7a334b2b93caba07d4f778
parent 32529e0128923e42126b5d14e444c18295a452ba
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 10:02:30 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 26 May 2005 10:02:30 -0700

    Merge of 'misc-fixes' branch from

    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

commit 284e423811495f632a7a334b2b93caba07d4f778
tree 1cf1ad8edfa13f7ea1e97ac11dbb023de45b10b6
parent 41bb4c43b34bcde7eb62cf19acdcf9f2eb13801d
author Marcello Maggioni <hayarms@gmail.com> Thu, 26 May 2005 15:47:35 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Thu, 26 May 2005 15:47:35 +0200

    [PATCH] timeout at boottime with NEC3500A (and possibly others) when inserted a CD in it

    From: Marcello Maggioni <hayarms@gmail.com>

    Problem: Some drives (NEC 3500, TDK 1616N, Mad-dog MD-16XDVD9, RICOH
    MP5163DA, Memorex DVD9 drive and IO-DATA's too for sure), if a
    CD/DVD is inserted into the tray when the system is booted and if
    before the OS bootup the BIOS checked for the presence of a bootable
    CD/DVD into the drive, during the IDE probe phase the drive may
    result busy and remain so for the next 25/30 seconds . This cause the
    drive to be skipped during the booting phase and not begin usable
    until the next reboot (if the reboot goes well and the drive doesn't
    timeout again).

    Solution: Rising the timeout time from 10 seconds to 35 seconds
    (during these 35 seconds every drive should wake up for sure
    according to the tests I've done).

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
commit 41bb4c43b34bcde7eb62cf19acdcf9f2eb13801d
tree cfaeeca6836443ee680e38273cb4f7ae94c023b2
parent 8604affde9d4f52f04342d6a37c77d95fa167e7a
author Stuart Hayes <Stuart_Hayes@dell.com> Thu, 26 May 2005 15:38:45 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Thu, 26 May 2005 15:38:45 +0200

    [PATCH] ide-scsi: kmap scatter/gather before doing PIO  

    From: Stuart Hayes <Stuart_Hayes@dell.com>

    The system can panic with a null pointer dereference using ide-scsi if
    PIO is being done on scatter gather pages that are in high memory,
    because page_address() returns 0.  We are actually seeing this using a
    tape drive.  This patch will kmap_atomic() the pages before performing
    PIO.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
commit 8604affde9d4f52f04342d6a37c77d95fa167e7a
tree 12143c1be244c69c7c2b488a34856f60d0625e03
parent bef9c558841604116704e10b3d9ff3dbf4939423
author Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Thu, 26 May 2005 14:55:34 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Thu, 26 May 2005 14:55:34 +0200

    [PATCH] convert IDE device drivers to driver-model

    * add ide_bus_match() and export ide_bus_type
    * split ide_remove_driver_from_hwgroup() out of ide_unregister()
    * move device cleanup from ide_unregister() to drive_release_dev()
    * convert ide_driver_t->name to driver->name
    * convert ide_driver_t->{attach,cleanup} to driver->{probe,remove}
    * remove ide_driver_t->busy as ide_bus_type->subsys.rwsem
      protects against concurrent ->{probe,remove} calls
    * make ide_{un}register_driver() void as it cannot fail now
    * use driver_{un}register() directly, remove ide_{un}register_driver()
    * use device_register() instead of ata_attach(), remove ata_attach()
    * add proc_print_driver() and ide_drivers_show(), remove ide_drivers_op
    * fix ide_replace_subdriver() and move it to ide-proc.c
    * remove ide_driver_t->drives, ide_drives and drives_lock
    * remove ide_driver_t->drivers, drivers and drivers_lock
    * remove ide_drive_t->driver and DRIVER() macro

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
commit 32529e0128923e42126b5d14e444c18295a452ba
tree d50736f63bd9692076d68c3f8748f1b6bf540a80
parent bef9c558841604116704e10b3d9ff3dbf4939423
author Albert Lee <albertcc@tw.ibm.com> Thu, 26 May 2005 03:49:42 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu, 26 May 2005 03:49:42 -0400

    [PATCH] libata: Fix zero sg_dma_len() on 64-bit platform

    When testing ATAPI PIO data transfer on the ppc64 platform,  __atapi_pio_bytes() got zero when
    sg_dma_len() is used. I checked the <asm-ppc64/scatterlish.h>, the struct scatterlist is defined as:

    struct scatterlist {
    	struct page *page;
    	unsigned int offset;
    	unsigned int length;

    	/* For TCE support */
    	u32 dma_address;
    	u32 dma_length;
    };

    #define sg_dma_address(sg)	((sg)->dma_address)
    #define sg_dma_len(sg)		((sg)->dma_length)

    So, if the scatterlist is not DMA mapped, sg_dma_len() will return zero on ppc64.
    The same problem should occur on the x86-64 platform.
    On the i386 platform, sg_dma_len() returns sg->length, that's why the problem does not occur on an i386.

    Changes:
    - Use sg->length if the scatterlist is not DMA mapped (yet).

    Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

commit c1ef1f351db70ad60c793b8218dd9f6739cfd66d
tree 3251d6bea051ad11397e6128ae584c1a4b85a5e6
parent ad6a9984eec72f3a609a8685281740f5e5f466aa
parent bef9c558841604116704e10b3d9ff3dbf4939423
author <jgarzik@pretzel.yyz.us> Thu, 26 May 2005 02:17:16 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu, 26 May 2005 02:17:16 -0400

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD

commit ad6a9984eec72f3a609a8685281740f5e5f466aa
tree c5c7ec0240ac7f99685153119e2cb70d526a92bc
parent 38778204a1ad0d2c266f85170c2fb7d80ed43160
parent 562faf469f35bf63c0b021550811280c81bdc52e
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:11:38 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:11:38 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch tlan

commit 38778204a1ad0d2c266f85170c2fb7d80ed43160
tree 228ac07333de66aa16bacab46fa939112b99b7aa
parent 8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7
parent 6da0f685935e13458a2206ac872d0d3c67a52f65
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:11:28 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:11:28 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch sis900

commit 8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7
tree 16b84843c379cbf366887d101b087b2b4287352b
parent 8a75e7d644b373f86c8c2316392cb7374fc4e063
parent b2e0852e1eee7c445b1789bef41204b64f981102
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:11:14 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:11:14 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch veth

commit 8a75e7d644b373f86c8c2316392cb7374fc4e063
tree c2beb29f8e4f5c1ea246d792693f8af4f7f03fef
parent f5a702b26a0cd6052f0bae2bc3f0548538d3909c
parent 05e08a2a297371564020f76d1bf8b3a931d5e1ed
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:11:06 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:11:06 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch qeth

commit f5a702b26a0cd6052f0bae2bc3f0548538d3909c
tree 5efa09ed89088363d6b1ea1d3c76bad1eeccc5b8
parent 5ea6f2c33f0c8b126136dbf1776ffbc444772cd7
parent c16ef1ceedff27c1b452724ca7f89b729651098f
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:10:53 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:10:53 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch ns83820

commit 5ea6f2c33f0c8b126136dbf1776ffbc444772cd7
tree 6c0623142810d4c5cd00e5d594955d28a41eee3f
parent acb969560d5b42500697a8bcd1667ac824928383
parent 760f86d78d92f39e2ceb55b40f0885eb755c8c2f
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:10:38 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:10:38 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch natsemi

commit acb969560d5b42500697a8bcd1667ac824928383
tree 97833fa73c86906f60dc07754afd92577f71e6c0
parent ee03a68c108cce4af3b4988cb1204e84d81f1243
parent 22c6d143f33f10721216a8cfa3a83f7edfc2bd4e
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:10:25 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:10:25 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch forcedeth

commit ee03a68c108cce4af3b4988cb1204e84d81f1243
tree 21554af057d7b1cdadbe8d0b0ccfd24bf72bcc21
parent 0c2fc10901e1b516526c92849ccd03327f119dbe
parent 41480af27a85d6008d9e11db8bc2730407c25e1d
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:09:52 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:09:52 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch airo

commit 0c2fc10901e1b516526c92849ccd03327f119dbe
tree 30305af53abe091a862c3efe8f363dc8793bad14
parent d20c507f28dbee33086e8212b98f9ddc5372cd81
parent e885b5e83965c320e8eff1ec3ebfbf821b375568
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 22:07:51 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 22:07:51 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch atmel

commit bef9c558841604116704e10b3d9ff3dbf4939423
tree f5c58b6b0cfd2a92fb3b1d1f4cbfdfb3df6f45d6
parent 3db602bdcd52d8b7523cfb4fb705cea84dbe1617
parent 4b463f785837f73bdd88ae3821bb7b69599010c9
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 18:01:26 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 18:01:26 -0700

    Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

commit 3db602bdcd52d8b7523cfb4fb705cea84dbe1617
tree dd4ed5173fdfe330961131b72448243eda8ac803
parent d20c507f28dbee33086e8212b98f9ddc5372cd81
parent 4c3a53d4108367f639e5e0fe9366dfd7679c5514
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 17:56:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 17:56:57 -0700

    Merge of 'new-ids' branch from

    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

commit 4c3a53d4108367f639e5e0fe9366dfd7679c5514
tree 0dcafa1f300870aecff4ac45bda16879aa89e61d
parent 525a099771d348a25d12ef9c47aa8680c7317e35
author Francisco Javier <ffelix@sshinf.com> Wed, 25 May 2005 19:29:37 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 19:29:37 -0400

    [PATCH] sata_promise: add PCI ID for FastTrak TX2200 2-ports

commit 525a099771d348a25d12ef9c47aa8680c7317e35
tree 86fe91606c8994f6358c8afeb1c3b9f0f4784bd7
parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a
author NAKAMURA Kenta <kenta@c.csce.kyushu-u.ac.jp> Wed, 25 May 2005 19:28:38 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 19:28:38 -0400

    [PATCH] sata_sil: new ID 1002:437A for ATI IXP400

commit d20c507f28dbee33086e8212b98f9ddc5372cd81
tree 30b3bda5e47d088b46ab8eab4d69d059a71197e1
parent a8bacec09352b86bd389cc93a20008577fa14764
author Colin Leroy <colin@colino.net> Wed, 25 May 2005 12:31:35 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:29 -0700

    [PATCH] therm_adt746x: show correct sensor locations

    This patch shows the correct locations of the heat sensors present in iBook
    and PowerBooks G4, instead of displaying them as being on CPU and GPU
    (which is not always the case).

    Signed-off-by: Colin Leroy <colin@colino.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit a8bacec09352b86bd389cc93a20008577fa14764
tree 608170ccc532ea2b96f1a5f073ae154cb8ce80fc
parent 3bf4fb820d7382318d178bd765c20028415466ab
author Colin Leroy <colin@colino.net> Wed, 25 May 2005 12:31:34 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:29 -0700

    [PATCH] Make sure therm_adt746x only handles known hardware

    This patch limits therm_adt746x to currently existing fan controllers in
    Apple laptops.  It may avoid problems with future hardware.

    Signed-off-by: Colin Leroy <colin@colino.net>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit e4f50f003dc568f6fc3904d451c562007bd09640
tree 6af02e623ba96d367c1c3948b9bb85bc793cc47f
parent 4f60fdf613536402e3313c5019b3ae6060b2ae4a
author Roland Dreier <roland@topspin.com> Wed, 25 May 2005 12:31:29 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:28 -0700

    [PATCH] IB: allow NULL sa_query callbacks

    Check if a client passes a NULL callback into an SA query, and if so, never
    call back.  This fixes an oops if someone unloads ib_ipoib and ib_sa in
    rapid succession.  ib_ipoib does an MCMember delete with a NULL callback
    and 0 timeout on unload, which is usually fine since the delete completes
    successfully.  However, if ib_sa is unloaded immediately afterwards, the
    delete will be canceled and ib_sa will try to call the (now already
    unloaded) ib_ipoib module back with the cancel completion, which triggers
    the oops.

    Signed-off-by: Roland Dreier <roland@topspin.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 561e148ea972a6e8d2c8f7aecc658b3a64f7a6de
tree 39feb619de4a5e6b6a3695082e44398c6140699f
parent e4f50f003dc568f6fc3904d451c562007bd09640
author Roland Dreier <roland@topspin.com> Wed, 25 May 2005 12:31:30 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:28 -0700

    [PATCH] IB: fix potential ib_umad leak

    Free all unclaimed MAD receive buffers when userspace closes our file so we
    don't leak memory.

    Signed-off-by: Roland Dreier <roland@topspin.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 4f60fdf613536402e3313c5019b3ae6060b2ae4a
tree 85205ce2d6c7b0d846fddc93527b4d55820ffe3b
parent dca79a046b93a81496bb30ca01177fb17f37ab72
author Alexander Nyberg <alexn@telia.com> Wed, 25 May 2005 12:31:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:28 -0700

    [PATCH] x86_64: CONFIG_BUG=n fixes

    Fixes some !CONFIG_BUG warnings:
    include/asm/mmu_context.h: I funktion `switch_mm':
    include/asm/mmu_context.h:57: varning: implicit declaration of function `out_of_line_bug'

    Signed-off-by: Alexander Nyberg <alexn@telia.com>
    Cc: Andi Kleen <ak@muc.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 3bf4fb820d7382318d178bd765c20028415466ab
tree 1a0cbad2e1d661baa60162d3246e5b6c44b476d0
parent 561e148ea972a6e8d2c8f7aecc658b3a64f7a6de
author Roland Dreier <roland@topspin.com> Wed, 25 May 2005 12:31:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:28 -0700

    [PATCH] IB: fix endianness of path record MTU field

    Make MTU field in SA PathRecord and MCMemberRecord a u8 rather than an enum
    to avoid complications with endianness.

    Signed-off-by: Roland Dreier <roland@topspin.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit dca79a046b93a81496bb30ca01177fb17f37ab72
tree ed5435413221f7a7b7e28edb49a4b47a9ac94594
parent 5daf05fbf73fc199e7a93a818e504856d07c5586
author Neil Horman <nhorman@redhat.com> Wed, 25 May 2005 12:31:27 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:27 -0700

    [PATCH] ipmi build fix

    It looks like the recent IPMI patches had some -mm-onlyisms.

    Signed-off-by: Neil Horman <nhorman@redhat.com>
    Cc: Corey Minyard <minyard@acm.org>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 5daf05fbf73fc199e7a93a818e504856d07c5586
tree 8e4eeb3012164f9aea42b7880460299bf7a09880
parent 1b981021e88c8c28dc6a22cb1a327d8dc9296473
author Gerd Knorr <kraxel@suse.de> Wed, 25 May 2005 12:31:26 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 15:31:27 -0700

    [PATCH] v4l: bttv i2c oops fix

    Don't try to access the i2c bus if the register wasn't successful.

    Signed-off-by: Gerd Knorr <kraxel@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 4b463f785837f73bdd88ae3821bb7b69599010c9
tree 80dc0a7e3e33596ff3ece410d9ff9e6b63e45b87
parent 6df16d0c35b9c0d3627f30c106e6142d3d12662b
parent 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5
author David S. Miller <davem@sunset.davemloft.net> Wed, 25 May 2005 14:58:04 -0700
committer David S. Miller <davem@sunset.davemloft.net> Wed, 25 May 2005 14:58:04 -0700

    Merge of /home/davem/src/GIT/linux-2.6/.git/

commit 1b981021e88c8c28dc6a22cb1a327d8dc9296473
tree 5eeefa658d7f9c13cd352994805ac3ead628b7e9
parent 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5
parent f6f3a488e56783836a0b6ca9188719a1229f505c
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 14:01:50 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 14:01:50 -0700

    Merge of 'for-linus' branch from

    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit f6f3a488e56783836a0b6ca9188719a1229f505c
tree 7fe7a590feb16b650ecdb6359eee695123217051
parent a58eae6480f354595c3954534e1ab591dc3ef1bf
parent dfa1b73ffb414b64dc0452260132a090eb25bf52
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 13:57:36 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 13:57:36 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch amd8111

commit a58eae6480f354595c3954534e1ab591dc3ef1bf
tree d73d9905ccb224c09c41a2ebebf08b29fa90eb7a
parent 09e62666d8a6312426f96bf483cdb003bde556fe
parent 1bcd315362e215a72b56d1330bbf32f1c74eefb5
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 13:57:25 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 13:57:25 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch pcnet32

commit 09e62666d8a6312426f96bf483cdb003bde556fe
tree 1ecb7fd093169fb77d7cd5925bc214fd6c6d82e4
parent 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4
parent ac79c82e793bc2440c4765e5eb1b834d2c18edf2
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 13:57:15 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 13:57:15 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch ixgb

commit 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4
tree 63e968991d043a30b80f7e3f99a3f6445455a704
parent d6d78f63cea62851806bf6ac40c6f53349de442b
parent 2648345fcbadfae8e7113112ff9402e465a184dc
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 13:57:03 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 13:57:03 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch e1000

commit d6d78f63cea62851806bf6ac40c6f53349de442b
tree b9bebd1bf342ae93f1d909641725e3d084ed61a9
parent a83d5cf7a1d1dd22f3a8162b728a7e895192dda8
parent 042e2fb70006f135469d546726451b7d14768980
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 13:56:55 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 13:56:55 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch e100

commit a83d5cf7a1d1dd22f3a8162b728a7e895192dda8
tree 6c6081aa8d8c8679e0a446234dceb0852ca34ca0
parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a
parent 9092f46b5aed4515d9a427d5dab3be1584851f07
author <jgarzik@pretzel.yyz.us> Wed, 25 May 2005 13:56:22 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed, 25 May 2005 13:56:22 -0400

    Merge of /spare/repo/netdev-2.6 branch misc-fixes

commit 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5
tree 146040edb5fb3b7ce29ba468f6392b7eadf28fdc
parent 0e15850200437c60b969025500e466383ec51ed8
author Jens Axboe <axboe@suse.de> Wed, 25 May 2005 17:00:15 +0200
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 10:17:08 -0700

    [PATCH] relax ide-cd dma restrictions

    This has been sitting for a while, and is causing lots of grief for
    people burning CDs.  It relaxes the dma restriction for ide-cd,
    requiring only the length to be 32-byte aligned, address should be fine
    at normal double word alignment.

    Signed-off-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d0e8e29100c9866878d43bbb40ca17e8fe429851
tree 079da8af2553ae3dd3556e82a5f8d2362b0ea755
parent 8f80e5c911465743ccd3a328f992c7d8aaebf1e8
author Stephen Rothwell <sfr@canb.auug.org.au> Wed, 25 May 2005 16:29:26 +1000
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 10:13:43 -0700

    [PATCH] ppc64 iSeries: fix boot time setting

    For quite a while, there has existed a hypervisor bug on legacy iSeries
    which means that we do not get the boot time set in the kernel.  This
    patch works around that bug.  This was most noticable when the root
    partition needed to be checked at every boot as the kernel thought it
    was some time in 1905 until user mode reset the time correctly.

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 0e15850200437c60b969025500e466383ec51ed8
tree 1acb5a22199c8eab0a04d3162a51abf2c046b70c
parent d0e8e29100c9866878d43bbb40ca17e8fe429851
author David Woodhouse <dwmw2@infradead.org> Wed, 25 May 2005 09:49:13 +0100
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 10:13:43 -0700

    [PATCH] Speedtouch resync after lost signal.

    There's a bigger Speedtouch update coming your way after 2.6.12 but in
    the meantime, let's at least make it automatically resync if the DSL
    signal is lost.

    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8f80e5c911465743ccd3a328f992c7d8aaebf1e8
tree 86f5508d38d2f3b2e0f0d5b528fb27edef431b0f
parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a
author Stephen Rothwell <sfr@canb.auug.org.au> Wed, 25 May 2005 13:41:26 +1000
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 25 May 2005 10:13:42 -0700

    [PATCH] ppc64: fix initialisation of gettimeofday calculations

    On PPC64, we keep track of when we need to update jiffies (and the
    variables used to calculate the time of day) based on the time base.

    If the time base frequence is sufficiently high compared to the
    processor clock frequency, then it is possible for the time of day
    variables to be corrupted at the time of the first decrementer interrupt
    we take.  This became obvious on a legacy iSeries where the time base
    frequency is the same as the processor clock.

    This one line patch fixes the initialisation so that the time of day
    variables and the indicator we use to tell when updates are due are
    better synchronised.

    Signed-off-by:  Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 6df16d0c35b9c0d3627f30c106e6142d3d12662b
tree 40b6208b97f200b91b268f69e81bf074236e2410
parent 7e43c84e3e5423ae72ae31e4cd7bbccfd1605194
parent 816242da3735957bee99aeba40aa60c4f120a101
author David S. Miller <davem@sunset.davemloft.net> Tue, 24 May 2005 18:08:07 -0700
committer David S. Miller <davem@sunset.davemloft.net> Tue, 24 May 2005 18:08:07 -0700

    Merge of davem@nuts.davemloft.net:/disk1/GIT/sparc-2.6/.git/

commit 9092f46b5aed4515d9a427d5dab3be1584851f07
tree 3723469c5f2af23e29e7c25036d1cdca893f90b9
parent 187a1a94d629621d1471b42308e63573b1150773
author John W. Linville <linville@tuxdriver.com> Wed, 18 May 2005 13:41:33 -0400
committer Jeff Garzik <jgarzik@pobox.com> Tue, 24 May 2005 00:26:12 -0400

    [PATCH] tulip: add return to ULI526X clause in tulip_mdio_write

    The 'if' clause for ULI526X in tulip_mdio_write allows for
    spin_unlock_irqrestore to be called twice for tp->mii_lock.  I believe
    this is caused by the unintentional omission of a return at the end
    of that clause.  This patch adds that return.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 816242da3735957bee99aeba40aa60c4f120a101
tree c5a1092a52911143b0c4f9bc4257c1dbafbb8bdd
parent ab3fc403633c38aef5ef48844f8e5dbfee7c34f8
author David S. Miller <davem@davemloft.net> Mon, 23 May 2005 15:52:08 -0700
committer David S. Miller <davem@davemloft.net> Mon, 23 May 2005 15:52:08 -0700

    [SPARC64]: Add boot option to force UltraSPARC-III P-Cache on.

    Older UltraSPARC-III chips have a P-Cache bug that makes us disable it
    by default at boot time.

    However, this does hurt performance substantially, particularly with
    memcpy(), and the bug is _incredibly_ obscure.  I have never seen it
    triggered in practice, ever.

    So provide a "-P" boot option that forces the P-Cache on.  It taints
    the kernel, so if it does trigger and cause some data corruption or
    OOPS, we will find out in the logs that this option was on when it
    happened.

    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 562faf469f35bf63c0b021550811280c81bdc52e
tree a97720dac2a2fcd94407c825703ecab14e617a88
parent 15efa9bb2d4da7cd9feb1c67fcf3d9e0e1bd00c6
author James Harper <james.harper@bendigoit.com.au> Thu, 05 May 2005 15:14:18 -0700
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 22:47:56 -0400

    [PATCH] fix PROMISC/bridging in TLAN driver

    This has been a problem for me for ages.  When using bridging, the driver
    is switched into promiscuous mode before the link init is complete.  The
    init complete routine then resets the promisc bit on the card so the kernel
    still thinks the card is in promiscuous mode but the card isn't.  doh.

    I think this bug only shows up in bridging when the bridge is started at
    boot time (or something else that sets promisc at the same time the card
    was started).  If promisc is enabled later it works.

    Here's a trivial (and hopefully correct) patch that works for me. It
    just calls the promisc/multicast setup routine after init.

    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>

commit c16ef1ceedff27c1b452724ca7f89b729651098f
tree a96c4517b3854e8dfa5f98a53d7efdb16f156fc7
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Benjamin LaHaise <bcrl@kvack.org> Wed, 06 Apr 2005 11:17:59 -0400
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 22:26:45 -0400

    [PATCH] ns83820 update

    Changes:
    - improved DAC ifdefs from Andi Kleen
    - removal of dead code from Adrian Bunk
    - fix half duplex collision behaviour

commit 15efa9bb2d4da7cd9feb1c67fcf3d9e0e1bd00c6
tree f321ae5edc291d3096c2bd9c57a3b7abef3552ca
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Stephen Hemminger <shemminger@osdl.org> Wed, 04 May 2005 15:33:11 -0700
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:25:23 -0400

    [PATCH] tlan: restore deleted module parameters.

    The module parameter values got lost in the conversion to the new module_param
    interface. This should fix it.

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

    Index: tlan/drivers/net/tlan.c
    ===================================================================

commit 6da0f685935e13458a2206ac872d0d3c67a52f65
tree d41bb51feca5abe9384e6fb60ba128ad8f31b68f
parent da369b01d49b34803265096eb92a2d6da61cf0d0
author Adrian Bunk <bunk@stusta.de> Sat, 30 Apr 2005 13:52:49 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:24:14 -0400

    [PATCH] SIS900 must select MII

    This patch fixes the following compile error caused by bk-netdev:

    <--  snip  -->

    ...
      LD      .tmp_vmlinux1
    drivers/built-in.o(.text+0x98528): In function `sis900_get_settings':
    : undefined reference to `mii_ethtool_gset'
    drivers/built-in.o(.text+0x98538): In function `sis900_set_settings':
    : undefined reference to `mii_ethtool_sset'
    drivers/built-in.o(.text+0x98517): In function `sis900_get_link':
    : undefined reference to `mii_link_ok'
    drivers/built-in.o(.text+0x98547): In function `sis900_nway_reset':
    : undefined reference to `mii_nway_restart'
    make: *** [.tmp_vmlinux1] Error 1

    <--  snip  -->

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Daniele Venzano <venza@brownhat.org>

commit 1bcd315362e215a72b56d1330bbf32f1c74eefb5
tree ceffa79b4dee4b9a489015afaad9574fed7b9742
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Don Fry <brazilnut@us.ibm.com> Fri, 29 Apr 2005 14:51:17 -0700
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:22:29 -0400

    [PATCH] pcnet32: fix resource leak with loopback test

    When running the loopback test, resources are not properly released on
    completion.  This patch frees all transmit resources after running the
    loopback test.  Tested on ia32 and ppc64 hardware.

    Signed-off-by: Don Fry <brazilnut@us.ibm.com>

commit 41480af27a85d6008d9e11db8bc2730407c25e1d
tree 4418c446791764ae018a56375d90d483bc3bc25f
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Dan Williams <dcbw@redhat.com> Tue, 10 May 2005 09:45:51 -0400
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:20:57 -0400

    [PATCH] wireless/airo: WEXT and quality corrections

    This patch brings the airo driver into line with the current
    WEXT specification of signal quality.  It also fixes the values
    used to determine signal quality and level for MPI & PCMCIA 350
    cards.  It turns out that BSSListRid.rssi was actually in dBm
    for 350 series cards, and that we can use the normalized
    signal strength reported by the card as our "quality" value, on
    a scale of 0 - 100.  Since signal level values are in dBm for
    this driver, max_qual->level MUST be 0, as specified in the WEXT
    spec.  This patch also uses the IW_QUAL constants new in WEXT
    version 17.

    Signed-off-by: Dan Williams <dcbw@redhat.com>

commit 760f86d78d92f39e2ceb55b40f0885eb755c8c2f
tree dd779d819fbda486cfdcc6ecd28afa4c1c40373b
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Herbert Xu <herbert@gondor.apana.org.au> Sat, 16 Apr 2005 16:24:16 +1000
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:18:56 -0400

    [PATCH] Fw: [Bugme-new] [Bug 4482] New: natsemi: incorrect initialization of IPv6 Neighbor-discovery multicast

    On Wed, Apr 13, 2005 at 05:36:42PM +0000, Andrew Morton wrote:
    >            Summary: natsemi: incorrect initialization of IPv6 Neighbor-
    >                     discovery multicast

    I've got a pair of FA312 cards and this problem has bothered me
    for ages.  This has finally prompted me to do something about it :)

    Turns out that somebody wasn't following the documentation.  We were
    doing 16-bit writes to 32-bit registers which led to some addresses
    working and others not so lucky.

    This patch should fix the problem.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit e885b5e83965c320e8eff1ec3ebfbf821b375568
tree 6bc2e9d321149f6f57e1a762a960a223ae89d5bf
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author simon@thekelleys.org.uk <simon@thekelleys.org.uk> Sat, 07 May 2005 21:33:31 +0100
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:11:54 -0400

    [PATCH] atmel wireless

    Below is a one-liner for the atmel wireless driver, just adding
    another card to the table.

commit 22c6d143f33f10721216a8cfa3a83f7edfc2bd4e
tree d380788538dc82d08545818ba569234e3d665016
parent 2918c35d311263bc313b3da272783860ce573189
author Manfred Spraul <manfred@colorfullife.com> Tue, 19 Apr 2005 21:17:09 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:10:01 -0400

    [PATCH] forcedeth: Update error handling

    Ayaz wrote an update to the error handling for forcedeth (which I
    modified heavily, thus all bugs are mine):
    The ERROR4 bit is not a fatal error, it just indicates a mismatch
    between the actual packet len and the len according to the 802.3 header.
    The patch adds proper handling.
    The patch also removes the code that drops all packets with RX_ERROR &
    (!RX_FRAMINGERR): ERROR4 errors are also not fatal.

commit b2e0852e1eee7c445b1789bef41204b64f981102
tree a1c0465f681b7aae24d0ade106f68593e74a8346
parent 41664c03f6c96a1f8a91714309b36f1b5ca85610
author Michael Ellerman <michael@ellerman.id.au> Thu, 12 May 2005 18:09:45 +1000
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:08:06 -0400

    [PATCH] iseries_veth: Cleanup skbs to prevent unregister_netdevice() hanging

    Hi Andrew, Jeff,

    The iseries_veth driver is badly behaved in that it will keep TX packets
    hanging around forever if they're not ACK'ed and the queue never fills up.

    This causes the unregister_netdevice code to wait forever when we try to take
    the device down, because there's still skbs around with references to our
    struct net_device.

    There's already code to cleanup any un-ACK'ed packets in veth_stop_connection()
    but it's being called after we unregister the net_device, which is too late.

    The fix is to rearrange the module exit function so that we cleanup any
    outstanding skbs and then unregister the driver.

    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

commit f27eff1ffd65236b8e421188f76ad1b0b94e06eb
tree 46184998b6bfbf24d083cbf5942ed1b10fe775af
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Michael Ellerman <michael@ellerman.id.au> Thu, 12 May 2005 17:47:27 +1000
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:08:05 -0400

    [PATCH] iseries_veth: Don't send packets to LPARs which aren't up

    Hi Andrew, Jeff,

    The iseries_veth driver has a logic bug which means it will erroneously
    send packets to LPARs for which we don't have a connection.

    This usually isn't a big problem because the Hypervisor call fails
    gracefully and we return, but if packets are TX'ed during the negotiation
    of the connection bad things might happen.

    Regardless, the right thing is to bail early if we know there's no
    connection.

    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

commit eb235aef724568ae15af831968000cf9a3974b26
tree ad6f5b503c26a81a734a436ceb2db9a933d8c9c2
parent f27eff1ffd65236b8e421188f76ad1b0b94e06eb
author Michael Ellerman <michael@ellerman.id.au> Thu, 12 May 2005 17:53:18 +1000
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:08:05 -0400

    [PATCH] iseries_veth: Set dev->trans_start so watchdog timer works right

    Hi Andrew, Jeff,

    The iseries_veth driver doesn't set dev->trans_start in it's TX path. This
    will cause the net device watchdog timer to fire earlier than we want it to,
    which causes the driver to needlessly reset its connections to other LPARs.

    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

commit 41664c03f6c96a1f8a91714309b36f1b5ca85610
tree 42805cf7bf92cf639f4c2e4dba8d1163cb11844b
parent eb235aef724568ae15af831968000cf9a3974b26
author Michael Ellerman <michael@ellerman.id.au> Thu, 12 May 2005 17:55:08 +1000
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:08:05 -0400

    [PATCH] iseries_veth: Don't leak skbs in RX path

    Hi Andrew, Jeff,

    Under some strange circumstances the iseries_veth driver can leak skbs.

    Fix is simply to call dev_kfree_skb() in the right place.
    Fix up the comment as well.

    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

commit e23dd9cdd676323c95fab47dc55123ba18f7e1ff
tree 6592c2330319316fff28c520cf9e3beb539528f6
parent d801145d910cc4a0fb418dda1dee227cec993cbd
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:38:11 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:17 -0400

    [PATCH] s390: fakell for high speed token ring

    [patch 8/10] s390: fakell for high speed token ring.

    From: Michael Holzheu <holzheu@de.ibm.com>

    Implement fake-link-layer for high speed token ring. Without it
    token ring packages get leading ethernet headers, which confuses
    dhcp.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit d801145d910cc4a0fb418dda1dee227cec993cbd
tree 423eda6277d89e89348907e185a49523debb0389
parent 5e39f2933f6707fc824b5e419dcac8ced67a57b6
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:37:53 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:17 -0400

    [PATCH] s390: qeth bug fixes

    [patch 7/10] s390: qeth bug fixes.

    From: Frank Pavlic <pavlic@de.ibm.com>

    qeth network driver changes:
     - Removed redundant code, use the same qeth_fill_buffer_frag
       for TSO path either
     - Using skb->frags solely is not correct since skb->data still
       points to the beginning of the whole data, even when it is
       a small portion we have to fill the qdio buffer with it.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit 9a4558193662e933588ee53e0202c103a68c9366
tree 0bc98056fc30a3a14dce381040fc06b11432f8b2
parent e23dd9cdd676323c95fab47dc55123ba18f7e1ff
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:38:28 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:17 -0400

    [PATCH] s390: qeth bug fixes

    [patch 9/10] s390: qeth bug fixes.

    From: Frank Pavlic <pavlic@de.ibm.com>

    qeth network driver changes:
     - Use sizeof(__u16) instead of '2' in qeth_fill_header.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit 05e08a2a297371564020f76d1bf8b3a931d5e1ed
tree 0aac8cafdec747a792c46dff1b934db642b0a054
parent 9a4558193662e933588ee53e0202c103a68c9366
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:39:09 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:17 -0400

    [PATCH] s390: qeth bug fixes

    [patch 10/10] s390: qeth bug fixes.

    From: Frank Pavlic <pavlic@de.ibm.com>

    qeth network driver related changes:
     - due to OSA hardware changes in TCP Segmentation Offload
       support we are able now to pack TSO packets too.
       This fits perfectly in design of qeth buffer handling and
       sending data respectively.
     - remove skb_realloc_headroom from the sending path since
       hard_header_len value provides enough headroom now.
     - device recovery behaviour improvement
     - bug fixed in Enhanced Device Driver Packing functionality

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit b5f9d55b64a5c7193f8965c90ba62244ea3180b2
tree 8a2cb8b36047af6d4a228a24aa1c045a6ed1545c
parent 109a260b66bfbab7ba9f985495791af21f910218
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:35:57 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:16 -0400

    [PATCH] s390: set online race in the lcs driver

    [patch 3/10] s390: set online race in the lcs driver.

    From: Michael Holzheu <holzheu@de.ibm.com>

    There is a race between lcs_stopcard() and lcs_open_device() which
    can lead to the error 'lcs: Error in starting channel, rc=-16'.
    lcs_open_device() is invoked when 'ifconfig up' is called due to a
    hotplug event, which is caused by register_netdev(). In parallel
    lcs_stopcard() is executed. Both functions are sending lcs commands.
    The second invocation fails with -EBUSY (-16) as return value.
    Move invocation of register_netdev() after invocation of lcs_stopcard
    to avoid the race.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit 7f81947b46c3efacc084ac5033f3fed702e46532
tree 8b611dc8dc406f26ed226792f0353fa4e4fc24d8
parent b5f9d55b64a5c7193f8965c90ba62244ea3180b2
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:36:22 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:16 -0400

    [PATCH] s390: schedule_timeout cleanup in ctctty

    [patch 4/10] s390: schedule_timeout cleanup in ctctty.

    From: Domen Puncer <domen@coderock.org>

    Use msleep_interruptible() instead of schedule_timeout()
    to guarantee the task delays as expected.

    Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
    Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
    Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 7394c928c849fe2ea5c20b6d73cbe7f220810d94
tree 1d126b50a776aa79b2d93878bf814bf7286dcc1d
parent 7f81947b46c3efacc084ac5033f3fed702e46532
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:36:47 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:16 -0400

    [PATCH] s390: ctc code cleanup

    [patch 5/10] s390: ctc code cleanup.

    From: Peter Tiedemann <ptiedem@de.ibm.com>

    ctc network driver changes:
     - Some code cleanup.

    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 5e39f2933f6707fc824b5e419dcac8ced67a57b6
tree 07fd30f15bdc61ea8d6e147d0e631880fec84dc5
parent 7394c928c849fe2ea5c20b6d73cbe7f220810d94
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:37:00 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:16 -0400

    [PATCH] s390: enable iucv_send2way_xxx functions

    [patch 6/10] s390: enable iucv_send2way_xxx functions.

    From: Ursula Braun-Krahl <braunu@de.ibm.com>

    The SSL-Server of z/VM wants to use the iucv_send2way
    and iucv_send2way_array function. Enable them again.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit 321de3c8cc12bdff073c23524aa1f6ed47cbeee4
tree db8b28572d8a0dc82fb66ca6134a2b037c629775
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:17:46 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:16 -0400

    [PATCH] s390: claw driver wiring

    [patch 1/10] s390: claw driver wiring.

    From: Andy Richter <richtera@us.ibm.com>

    claw network driver changes:
     - Add an entry to the drivers/s390/net Makefile to build the claw driver.
     - Add claw channel type to cu3088.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit 109a260b66bfbab7ba9f985495791af21f910218
tree de13642e8a847e1273161e750b1da1495c67a777
parent 321de3c8cc12bdff073c23524aa1f6ed47cbeee4
author Frank Pavlic <pavlic@de.ibm.com> Thu, 12 May 2005 20:19:44 +0200
committer Jeff Garzik <jgarzik@pobox.com> Sun, 15 May 2005 18:06:16 -0400

    [PATCH] s390: multicast address registration in lcs

    [patch 2/10] s390: multicast address registration in lcs.

    From: Michael Holzheu <holzheu@de.ibm.com>

    When setting lcs devices online you can run into an endless loop,
    because the code that registers the multicast addresses uses
    list_for_each_entry instead of list_for_each_entry_safe.

    Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

commit 962082b6df11fe8cabafd2971b07c914cd52ee2a
tree b6c1cf72db43fbb5064cc91d3d07a4ffb68a6b0c
parent 6bdacb1ad58bb6b772a4fc18f21684437bd5f439
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:19:46 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:59:28 -0400

    [PATCH] e100: Performance optimizations to e100 Tx Path

    Performance optimizations to e100 Tx Path

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 6bdacb1ad58bb6b772a4fc18f21684437bd5f439
tree 5e725858fcb9783c8c88986c1fa16d02ecdeebcb
parent 0236ebb7ae85935b3b96eef7e8a4e203ea9958a0
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:17:54 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:59:28 -0400

    [PATCH] e100: Fix Wake on lan related issues

    Fix Wake on lan related issues

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 1f53367d5d75ba37f258f6e955d6fc24814051a0
tree 05f5c9c8f79edb4d6a7b8465e46992de3941b10a
parent 2acdb1e05c1a92e05ee710ed8f226a8f3183d5a0
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:17:20 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:59:28 -0400

    [PATCH] e100: Render e100 NAPI state machine

    Render e100 NAPI state machine to be similar to the non-NAPI one.

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 042e2fb70006f135469d546726451b7d14768980
tree adb6d0eeb183e74c6bbac4f07a0e1699c4add156
parent 962082b6df11fe8cabafd2971b07c914cd52ee2a
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:20:14 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:59:28 -0400

    [PATCH] e100: Driver version, white space, comments, device id

    Driver version, white space, comments.
    Also enabled ICH-7 support

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 0236ebb7ae85935b3b96eef7e8a4e203ea9958a0
tree 040bae76d6b77d5a3ee3a5ba70b0de55df169a5d
parent 1f53367d5d75ba37f258f6e955d6fc24814051a0
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:17:42 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:59:28 -0400

    [PATCH] e100: Synchronize interface link state with poll routine

    Synchronize interface link state with e100 poll routine

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 2acdb1e05c1a92e05ee710ed8f226a8f3183d5a0
tree e977185205ec68361d83c1e05b51b46174213628
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:16:58 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:59:27 -0400

    [PATCH] e100: Execute tx_timeout task outside interrupt context

    Execute tx_timeout task outside the interrupt context

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit f404de1cd407c1f56fa478810c6c48e015d377bd
tree e7a40872bc886c7b1b784624402663eb1239f527
parent c2eba932b14718e34ac2609e35c6d41e032a2478
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:04:54 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:42 -0400

    [PATCH] ixgb: Code optimization

    Code optimization

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit c2eba932b14718e34ac2609e35c6d41e032a2478
tree 9e18fd51bd7bf99e1d85eb3bc63021232469b03b
parent 5e3c30deb21d0eb0da44830fb1c1fc7054e54229
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:04:32 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:42 -0400

    [PATCH] ixgb: Remove hook for suspend, no power management

    Remove hook for suspend. No power management in 10GbE Controllers

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit ac79c82e793bc2440c4765e5eb1b834d2c18edf2
tree 39a7c23fbb6ba9be73b7aacfebf24d3bfb68ef10
parent 37d16f823799918107440cb9e552b0709347f77c
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:05:32 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:42 -0400

    [PATCH] ixgb: Driver version, white space, comments, device id

    Driver version, white space, comments, device id & other

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit 5e3c30deb21d0eb0da44830fb1c1fc7054e54229
tree 5dad3ce257e4f14caf8ef3cc93e404b1a04ae33d
parent abf481d6af8670c89f33f354c6fbd9977b23cebc
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:04:07 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:42 -0400

    [PATCH] ixgb: Support for ethtool -d

    ixgb support for ethtool -d

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ethtool.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ethtool.c

commit 37d16f823799918107440cb9e552b0709347f77c
tree 427355cfc97b90cc1debce5496749d625cd9ba74
parent f404de1cd407c1f56fa478810c6c48e015d377bd
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:05:12 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:42 -0400

    [PATCH] ixgb: Fixed msec_delay in osdep to use msleep

    Fixed msec_delay in osdep to use msleep

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_osdep.h net-drivers-2.6/drivers/net/ixgb.new/ixgb_osdep.h

commit abf481d6af8670c89f33f354c6fbd9977b23cebc
tree fc604f98db1a85be2c025c10192fd6cb767c29aa
parent 41639fed1b32dde4ea3d94242a89308435d341be
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:03:32 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:41 -0400

    [PATCH] ixgb: Fix EEPROM functions to be endian-aware

    Fix EEPROM functions to be endian-aware

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ee.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ee.c

commit 6dfbb6dd391139be9f1cd333877c6e2b03da4bba
tree 2c2d4e22e332eb6602c294b7e65d63031e2db436
parent 0c73f58636385a4d3dc68d0d0829d4c39d61b621
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 18:56:40 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:41 -0400

    [PATCH] ixgb: Mask RXO interrupt

    Disable RXO interrupt to decrease recovery time when system is overloaded with data

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit 5633684d008b777ab169e8efcef39a898482f531
tree c031a223e9ef9159f9f4982b042652ed768b4672
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 18:45:50 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:41 -0400

    [PATCH] ixgb: Fix multi-cast packet count in statistics

    Fix multi-cast packet count in statistics

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit 41639fed1b32dde4ea3d94242a89308435d341be
tree 2e8232795eff9e0a2b6c6b3d22c0532c472c749d
parent 6dfbb6dd391139be9f1cd333877c6e2b03da4bba
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 18:51:54 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:41 -0400

    [PATCH] ixgb: Reset status in the Rx

    Reset status in the Rx descriptor prior to handing it to the controller.
    Leave three Rx descriptors unused

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit 0c73f58636385a4d3dc68d0d0829d4c39d61b621
tree c27c1632dc2b55dbbe5e33fbe0a736176da70196
parent 06c2f9ecb5b53f9d4fc1ef596da16683cc4af5ba
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 18:48:06 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:41 -0400

    [PATCH] ixgb: Change RDT write bump size to 4

    Change RDT write bump size back to 4

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb.h net-drivers-2.6/drivers/net/ixgb.new/ixgb.h

commit 06c2f9ecb5b53f9d4fc1ef596da16683cc4af5ba
tree 9117d948a668e0c9f795678fec6a25d97af6f4e7
parent 5633684d008b777ab169e8efcef39a898482f531
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 18:46:51 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:54:41 -0400

    [PATCH] ixgb: Do not set the RS bit on context descriptors

    Don't set the RS bit on context descriptors, causes un-necessary bus activity

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

    diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c

commit 2648345fcbadfae8e7113112ff9402e465a184dc
tree ed615c4e72328e4ba137d700d341c96b7e611229
parent 1125ecbc0a89db07bb4eb1ba892a23367c3bdeb5
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:44:46 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:55 -0400

    [PATCH] e1000:Driver version,white space,comments,device id

    Driver version, white space, comments, device id & other

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c

commit 1125ecbc0a89db07bb4eb1ba892a23367c3bdeb5
tree 5302b4334c8f1f9ed6984231101e97e761b8b903
parent 0e6ef3e02b6f07e37ba1c1abc059f8bee4e0847f
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:44:25 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:55 -0400

    [PATCH] e1000:Adjust flow control watermarks for Jumbo Frames

    Adjust flow control watermarks for Jumbo Frames

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit f1d2e4905eed4b13c3ba56ac6d30c283be996963
tree b852be3add7242e2c667188a0fb7ed5300a8081a
parent 97338bde27d97347bc83203d6ac5e93be1ebcd03
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:42:04 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:54 -0400

    [PATCH] e1000:Removed redundant statement in e1000_clean_tx_irq

    Removed redundant statement in e1000_clean_tx_irq

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit f0d11ed0b0650d2f93f56f65167c10a577c16c88
tree 323348d8a7a272ea33be40168cee46c0f1bc13a8
parent f1d2e4905eed4b13c3ba56ac6d30c283be996963
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:43:28 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:54 -0400

    [PATCH] e1000: Modified e1000_clean: exit poll

    Modified e1000_clean:: exit poll if no Tx and work_done == 0

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 97338bde27d97347bc83203d6ac5e93be1ebcd03
tree a2897ca9e0ea40ef14ea1bcb4af69769021e9414
parent a4cb847dac40577dd751a4deb4085ed080780679
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:41:46 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:54 -0400

    [PATCH] e1000: Implement a workaround for 82546 errata 10

    Implement 82546 errata 10 --  first Tx descriptor cannot have more than 2015 byte of data in it or it could hang the transmitter.

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 2d7edb923a823660b081bd4c660300ee19adca8d
tree 3442b72425638e8530d31490339567d42706534a
parent f0d11ed0b0650d2f93f56f65167c10a577c16c88
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:43:52 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:54 -0400

    [PATCH] e1000:82573 specific code & packet split code

    82573 specific code & packet split code

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h

commit 0e6ef3e02b6f07e37ba1c1abc059f8bee4e0847f
tree 4382fe850661782004eabab9194d894a35fb3b2b
parent 2d7edb923a823660b081bd4c660300ee19adca8d
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:44:14 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:54 -0400

    [PATCH] e1000:Fix Packet Buffer Allocation logic for 82547_rev_2

    Fix Packet Buffer Allocation logic for 82547_rev_2 controller

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit a4cb847dac40577dd751a4deb4085ed080780679
tree 673dcbdd4bd65d32b9181ad61779b0788b36e8de
parent 6d9157577d926d2a83fe8d4914c0cc216deb5842
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:41:28 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:53 -0400

    [PATCH] e1000: e1000 stops working after resume

    e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 70b8f1e16a788eccdd36f39679774b1a08a6ba55
tree ec8314d660c96cff7b594fd0d157a26115e23818
parent 2701234fc0372630457e3da14e36cde53c57d12e
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:40:40 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:53 -0400

    [PATCH] e1000: Dump information on Tx ring

    Dump information on Tx ring when 'NETDEV: Watchdog' condition is reached

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 6d9157577d926d2a83fe8d4914c0cc216deb5842
tree 70082b81242a849a62091d18389acafa7bb76b80
parent 70b8f1e16a788eccdd36f39679774b1a08a6ba55
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:41:11 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:53 -0400

    [PATCH] e1000:Fix computation of netdev stats from controller stats counters

    Fix computation of netdev stats from controller stats counters - from
    sfeldma@pobox.com

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 5de556249fde97493a4c79dbf8979ace0f76789f
tree a64f68956aeaad6ebf6409a5b5cbd38a4541c7a8
parent fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:39:30 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:53 -0400

    [PATCH] e1000: Enable polling before enabling interrupts

    Enable polling before enabling interrupts -- avoids (in NAPI mode) entering the ISR and returning without doing any work because polling is not enabled. [romieu@fr.zoriel.com]

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 4e48a2b91d408357cb0747151d8db5368ac8f1d0
tree 600d1e3fdec1ef85d08eb7bf286a015ac308f09b
parent 5de556249fde97493a4c79dbf8979ace0f76789f
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:39:53 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:53 -0400

    [PATCH] e1000: Fix kernel panic with 82541 LOM

    Fix kernel panic with 82541 LOM when using a 100M cable

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit 2701234fc0372630457e3da14e36cde53c57d12e
tree c95073b15f364a3528da2d5ff40bad66e8de22ac
parent 4e48a2b91d408357cb0747151d8db5368ac8f1d0
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:40:28 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:53 -0400

    [PATCH] e1000: Delay clean-up of last Tx packet

    Delay clean-up of last Tx packet to fix pre-mature writeback issue of Tx descriptors only when TSO is enabled

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

commit fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07
tree 3a1ec2dbb7f0298b0de9db2b815bf7b1d2c4936c
parent df25e164878836196ee93d1a5757867da6eac30e
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:39:13 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:52 -0400

    [PATCH] e1000: MSI support for PCI-e adapters

    MSI support for PCI-e adapters

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h

commit e4eff7291c977308989b24fdfc7215a501302e6a
tree c773bc7d11aaf8acf8928c801afc34561818bc53
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:38:30 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:52 -0400

    [PATCH] e1000: made loopback test robust

    Added enhanced functionality to the loopback diags to wrap the descriptor rings.

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c

commit df25e164878836196ee93d1a5757867da6eac30e
tree 56a76255f8a7e30ffcba14432f408ce8b5a99917
parent e4eff7291c977308989b24fdfc7215a501302e6a
author Malli Chilakala <mallikarjuna.chilakala@intel.com> Thu, 28 Apr 2005 19:38:43 -0700
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:48:52 -0400

    [PATCH] e1000: Fix msec-delay definition to use msleep

    Fix msec-delay definition in e1000_osdep.h to use msleep

    Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
    Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>
    diff -up net-drivers-2.6/drivers/net/e1000/e1000_osdep.h net-drivers-2.6/drivers/net/e1000.new/e1000_osdep.h

commit da369b01d49b34803265096eb92a2d6da61cf0d0
tree 6967b8292fa142e8e83f9bbaa788dacbfcfd3a8d
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Daniele Venzano <webvenza@libero.it> Thu, 12 May 2005 20:13:14 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 20:13:14 -0400

      [PATCH] More ethtool support for sis900 and warning fix
      
      Add support to sis900 for the following ethtool ops:
            - get_link
            - get_settings
            - set_settings
            - nway_reset
      
      Signed-off-by: Daniele Venzano <webvenza@libero.it>
      Signed-off-by: Jeff Garzik <jgarzik@pobox.com>


commit 2918c35d311263bc313b3da272783860ce573189
tree 4f1bf3f0574c11e37e89954f76a5ee8fe298bac6
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Michal Schmidt <xschmi00@stud.feec.vutbr.cz> Thu, 12 May 2005 19:42:06 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 19:42:06 -0400

    [PATCH] forcedeth: netpoll support

commit dfa1b73ffb414b64dc0452260132a090eb25bf52
tree d01ca6357ecdeb874bcf8ff3ea9a2131afd41862
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author Liu Tao <liutao1980@gmail.com> Thu, 12 May 2005 19:40:38 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu, 12 May 2005 19:40:38 -0400

      [PATCH] drivers/net/amd8111e.c: fix NAPI interrupt in poll
      
      This patch makes the netif_rx_complete() and rx_interrupt_enable
      atomic when exiting the poll() method, so to avoid interrupt in poll.
      It also fixes the rx interrupt check logic in interrupt handler.
      
      Signed-off-by: Liu Tao <liutao1980@gmail.com>
      Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit d3870398fafd4911bd84573b78be4b6b762f32b0
tree 4c7821e6893049bd3c01346b072f2e536b657fd9
parent 68d1498c3a7e5223b587ad067111fbed12df52a1
author Nathan Scott <nathans@sgi.com> Fri, 06 May 2005 06:44:46 -0700
committer Christoph Hellwig <hch@melbourne.sgi.com> Fri, 06 May 2005 06:44:46 -0700

    [XFS] Fix directory inodes ioctl compat code, minor code consistency cleanups

    SGI Modid: xfs-linux:xfs-kern:21810a

    Signed-off-by: Nathan Scott <nathans@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>

commit 68d1498c3a7e5223b587ad067111fbed12df52a1
tree 92b17700c7d6696f84148bd078d83cc377053547
parent 2512809255d018744fe6c2f5e996c83769846c07
author Russell Cattelan <cattelan@sgi.com> Fri, 06 May 2005 06:42:22 -0700
committer Christoph Hellwig <hch@melbourne.sgi.com> Fri, 06 May 2005 06:42:22 -0700

    [XFS] Fix a bug in xfs_iomap for extent handling of write cases

    This may be the cause of several open PV's of incorrect
    delay flags being set and then tripping asserts.
    Do not return a delay alloc extent when the caller is asking to do a write.

    SGI Modid: xfs-linux:xfs-kern:189616a

    Signed-off-by: Russell Cattelan <cattelan@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>