LWN.net Logo

2.6.12-rc6 long-format changelog

commit 7cef5677ef3a8084f2588ce0a129dc95d65161f6
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Mon Jun 6 08:22:29 2005 -0700

    Linux 2.6.12-rc6
    
    Getting ready for the real release..

commit eae936e21bd726f9d9555f2262d439fbcd61dccf
Author: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Date:   Sat Jun 4 15:43:34 2005 -0700

    [PATCH] serial: update NEC VR4100 series serial support
    
    - Changed the return value of unknown type to NULL.
    
    - Deleted the NULL check of dev_id in siu_interrupt().
    
    - Deleted the NULL check of port->membase in siu_shutdown().
    
    - Added the NULL check of port->membase to siu_startup().
    
    - Removed early_uart_ops. Now using vr41xx_siu standerd one.
    
    - Changed KSEG1ADDR() in siu_console_setup() to ioremap().
    
    - When uart_add_one_port() failed, changed to set NULL to port->dev.
    
    Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
    Cc: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f26d583e41aedad8159acf9533fa287d7209dfbf
Author: Gerald Schaefer <geraldsc@de.ibm.com>
Date:   Sat Jun 4 15:43:33 2005 -0700

    [PATCH] s390: deadlock in appldata
    
    The system might hang when using appldata_mem with high I/O traffic and a
    large number of devices.  The spinlocks bdev_lock and swaplock are acquired
    via calls to si_meminfo() and si_swapinfo() from a tasklet, i.e.  interrupt
    context, which can lead to a deadlock.  Replace tasklet with work queue.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 595bf2aacae96d0f87352a1ff5476b79e52e212f
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date:   Sat Jun 4 15:43:32 2005 -0700

    [PATCH] s390: in_interrupt vs. in_atomic
    
    The condition for no context in do_exception checks for hard and soft
    interrupts by using in_interrupt() but not for preemption.  This is bad for
    the users of __copy_from/to_user_inatomic because the fault handler might call
    schedule although the preemption count is != 0.  Use in_atomic() instead
    in_interrupt().
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c5c3a6d8fe923b8780b9cd10e72344b8cf8518b5
Author: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Date:   Sat Jun 4 15:43:32 2005 -0700

    [PATCH] s390: uml ptrace fixes
    
    To make UML build and run on s390, I needed to do these two little
    changes:
    
    1) UML includes some of the subarch's (s390) headers. I had to
       change one of them with the following one-liner, to make this
       compile. AFAICS, this change doesn't break compilation of s390
       itself.
    
    2) UML needs to intercept syscalls via ptrace to invalidate the syscall,
       read syscall's parameters and write the result with the result of
       UML's syscall processing. Also, UML needs to make sure, that the host
       does no syscall restart processing. On i386 for example, this can be
       done by writing -1 to orig_eax on the 2nd syscall interception
       (orig_eax is the syscall number, which after the interception is used
       as a "interrupt was a syscall" flag only.
       Unfortunately, s390 holds syscall number and syscall result in gpr2 and
       its "interrupt was a syscall" flag (trap) is unreachable via ptrace.
       So I changed the host to set trap to -1, if the syscall number is changed
       to an invalid value on the first syscall interception.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 778959db97c7ed8eed4025916916b17a4629ce3d
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date:   Sat Jun 4 15:43:30 2005 -0700

    [PATCH] s390: ptrace peek and poke
    
    The special cases of peek and poke on acrs[15] and the fpc register are not
    handled correctly.  A poke on acrs[15] will clobber the 4 bytes after the
    access registers in the thread_info structure.  That happens to be the kernel
    stack pointer.  A poke on the fpc with an invalid value is not caught by the
    validity check.  On the next context switch the broken fpc value will cause a
    program check in the kernel.  Improving the checks in peek and poke fixes
    this.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 854715be73b221596c7127d4042e1120d4539e19
Author: Qu Fuping <fs@ercist.iscas.ac.cn>
Date:   Sat Jun 4 15:43:29 2005 -0700

    [PATCH] mpage_end_io_write() I/O error handling fix
    
    When fsync() runs wait_on_page_writeback_range() it only inspects pages which
    are actually under I/O (PAGECACHE_TAG_WRITEBACK).  If a page completed I/O
    prior to wait_on_page_writeback_range() looking at it, it is supposed to have
    recorded its I/O error state in the address_space.
    
    But mpage_mpage_end_io_write() forgot to set the address_space error flag in
    this case.
    
    Signed-off-by: Qu Fuping <fs@ercist.iscas.ac.cn>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d3045064054a93d303094cfb96d980cc3c82a64c
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Sat Jun 4 08:18:39 2005 -0700

    Automatic merge of 'misc-fixes' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit 910313aa1db1b0c63ee9684bb4f35c17e7192f43
Author:  <jgarzik@pretzel.yyz.us>
Date:   Sat Jun 4 04:31:44 2005 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix

commit 8be3de3fd8469154a2b3e18a4712032dac5b4a53
Author: Nathan Lynch <ntl@pobox.com>
Date:   Fri Jun 3 14:25:25 2005 -0500

    [PATCH] prom_find_machine_type typo breaks pSeries lpar boot
    
    A typo in prom_find_machine_type from Ben's recent patch "ppc64: Fix
    result code handling in prom_init" prevents pSeries LPAR systems from
    booting.
    
    Tested on a pSeries 570 and OpenPower 720 (both Power5 LPAR).
    
    Signed-off-by: Nathan Lynch <ntl@pobox.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d8d088d25822b0199fdfb392085e1cf8a5914a97
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Fri Jun 3 08:54:02 2005 -0700

    Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6

commit b05a720b374ac6af05b2fd4c70bb2c61a9f461ca
Author: Greg Ungerer <gerg@snapgear.com>
Date:   Fri Jun 3 11:35:20 2005 +1000

    [PATCH] m68knommu: fix scheduling and race problems in idle loop
    
    Re-work the m68knommu specific idle code according to suggestions
    from Nick Piggin <nickpiggin@yahoo.com.au>.
    
    A couple of rules that we need to follow:
    
    1. Preempt should now disabled over idle routines. Should only be enabled
    to call schedule() then disabled again.
    
    3. When cpu_idle finds (need_resched() == 'true'), it should call schedule().
    It should not call schedule() otherwise.
    
    Also fix interrupt locking around the need_resched() and cpu stop state
    so that there is no race condition.
    
    Signed-off-by: Greg Ungerer <gerg@snapgear.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f4d340cf869b2b63e1043eed72aa2eab6fa2cb2c
Author: David Brownell <david-b@pacbell.net>
Date:   Fri Jun 3 08:01:35 2005 -0700

    [PATCH] USB: resolve Zaurus problem
    
    This "obvious" one-liner is needed to recognize Zaurus SL 6000;
    it just checks two GUIDs not just one.
    
    OSDL bugids #4512 and #4545 seem to be duplicates of this report.
    
    From: Gerald Skerbitz <gsker@tcfreenet.org>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c92715b3c22e94105a8fd9e4a23047d05c5077e7
Author: Nathan Lynch <ntl@pobox.com>
Date:   Thu Jun 2 17:15:09 2005 -0500

    [SCSI] fix slab corruption during ipr probe
    
    With CONFIG_DEBUG_SLAB=y I see slab corruption messages during boot on
    pSeries machines with IPR adapters with any 2.6.12-rc kernel.
    
    The change which seems to have introduced the problem is "SCSI: revamp
    target scanning routines" and may be found at:
    http://marc.theaimsgroup.com/?l=bk-commits-head&m=111...
    
    In order to revert that in a 2.6.12-rc1 tree, I had to revert "target
    code updates to support scanned targets" first:
    http://marc.theaimsgroup.com/?l=bk-commits-head&m=111...
    
    With both patches reverted, the corruption messages go away.
    
    ipr: IBM Power RAID SCSI Device Driver version: 2.0.13 (February 21,
    2005)
    ipr 0001:d0:01.0: Found IOA with IRQ: 167
    ipr 0001:d0:01.0: Starting IOA initialization sequence.
    ipr 0001:d0:01.0: Adapter firmware version: 020A005C
    ipr 0001:d0:01.0: IOA initialized.
    scsi0 : IBM 570B Storage Adapter
      Vendor: IBM       Model: VSBPD4E1  U4SCSI  Rev: 4770
      Type:   Enclosure                          ANSI SCSI revision: 02
      Vendor: IBM   H0  Model: HUS103036FL3800   Rev: RPQF
      Type:   Direct-Access                      ANSI SCSI revision: 04
      Vendor: IBM   H0  Model: HUS103036FL3800   Rev: RPQF
      Type:   Direct-Access                      ANSI SCSI revision: 04
      Vendor: IBM   H0  Model: HUS103036FL3800   Rev: RPQF
      Type:   Direct-Access                      ANSI SCSI revision: 04
      Vendor: IBM   H0  Model: HUS103036FL3800   Rev: RPQF
      Type:   Direct-Access                      ANSI SCSI revision: 04
      Vendor: IBM       Model: VSBPD4E1  U4SCSI  Rev: 4770
      Type:   Enclosure                          ANSI SCSI revision: 02
    Slab corruption: start=c0000001e8de5268, len=512
    Redzone: 0x5a2cf071/0x5a2cf071.
    Last user: [<c00000000029c3a0>](.scsi_target_dev_release+0x28/0x50)
    080: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6a
    Prev obj: start=c0000001e8de5050, len=512
    Redzone: 0x5a2cf071/0x5a2cf071.
    Last user: [<0000000000000000>](0x0)
    000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b
    010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b
    Next obj: start=c0000001e8de5480, len=512
    Redzone: 0x170fc2a5/0x170fc2a5.
    Last user: [<c000000000228d7c>](.as_init_queue+0x5c/0x228)
    000: c0 00 00 01 e8 83 26 08 00 00 00 00 00 00 00 00
    010: 00 00 00 00 00 00 00 00 c0 00 00 01 e8 de 54 98
    Slab corruption: start=c0000001e8de5268, len=512
    Redzone: 0x5a2cf071/0x5a2cf071.
    Last user: [<c00000000029c3a0>](.scsi_target_dev_release+0x28/0x50)
    080: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6a
    Prev obj: start=c0000001e8de5050, len=512
    Redzone: 0x5a2cf071/0x5a2cf071.
    Last user: [<0000000000000000>](0x0)
    000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b
    010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b
    Next obj: start=c0000001e8de5480, len=512
    Redzone: 0x170fc2a5/0x170fc2a5.
    Last user: [<c000000000228d7c>](.as_init_queue+0x5c/0x228)
    000: c0 00 00 01 e8 83 26 08 00 00 00 00 00 00 00 00
    010: 00 00 00 00 00 00 00 00 c0 00 00 01 e8 de 54 98
    ...
    
    I did some digging and the problem seems to be a refcounting issue in
    __scsi_add_device.  The target gets freed in scsi_target_reap, and
    then __scsi_add_device tries to do another device_put on it.
    
    Signed-off-by: Nathan Lynch <ntl@pobox.com>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

commit 18e144d32cd3dae6953c385e4b376ef9688b61b0
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date:   Fri May 27 15:04:47 2005 -0700

    [SCSI] qla2xxx: fix bad locking during eh_abort
    
    
    Correct incorrect locking order in qla2xxx_eh_abort() handler which
    would case a hang during certain code-paths.
    
    With extra pieces to fix the irq state in the locks.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

commit 39a66b8d22a36cfa1a48f7f59c6a4639d9c99653
Author: Craig Shelley <craig@microtron.org.uk>
Date:   Fri May 27 00:09:56 2005 +0100

    [PATCH] USB: CP2101 Add support for flow control
    
    Added support to get/set flow control line levels using TIOCMGET and
    TIOCMSET.
    Added support for RTSCTS hardware flow control.
    cp2101_get_config and cp2101_set_config modified to support long request
    strings, required for configuring flow control.
    
    Signed-off-by: Craig Shelley craig@microtron.org.uk
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 719df469cb51199316ae2a11c75a8046be34b899
Author: Roman Kagan <rkagan@mail.ru>
Date:   Fri May 6 00:55:56 2005 +0400

    [PATCH] USB: update urb documentation
    
    On Wed, May 04, 2005 at 01:37:30PM -0700, David Brownell wrote:
    > On Wednesday 04 May 2005 12:19 pm, Roman Kagan wrote:
    > > struct urb {
    > > 	/* private, usb core and host controller only fields in the urb */
    > > 	...
    > > 	struct list_head urb_list;	/* list pointer to all active urbs */
    > > 	...
    > > };
    > >
    > > Is it safe to use it for driver's purposes when the driver owns the urb,
    > > that is, starting from the completion routine until the urb is submitted
    > > with usb_submit_urb()?
    >
    > Right now, it should be.
    
    Great!  FWIW I've briefly tested a modified version of usbatm using
    the list head in struct urb instead of creating a wrapper struct, and I
    haven't seen any failures yet.  So I tend to believe that your "should
    be" actually means "is" :)
    
    > > If it is, can it be guaranteed in future, e.g.
    > > by moving the list head into the public section of struct urb?
    >
    > In fact I'm not sure why it ever got called "private" to usbcore/hcds.
    > I thought the idea was that it should be like urb->status, reserved for
    > whoever controls the URB.
    
    OK then how about the following (essentially documentation) patch?
    
    Signed-off-by: Roman Kagan <rkagan@mail.ru>
    Acked-by: David Brownell <david-b@pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 1724757e5ab5219b46876ac6e4e362a4b2dcfa86
Author: Phil Dibowitz <phil@ipom.com>
Date:   Sat May 21 00:45:55 2005 -0700

    [PATCH] USB Storage: Add unusual_devs for Trumpion Voice Recorder
    
    The original entry of this patch was submitted by Filippo Bardelli
    <filibard@libero.it>, with cleanups and patch-ification by me.
    
    This corrects the subclass that the device reports.
    
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 77ddecc3c047e4e9bd7332d3173def93ea2de1ad
Author: Paulo Marques <pmarques@grupopie.com>
Date:   Wed May 18 13:12:49 2005 +0100

    [PATCH] USB: make MODALIAS code a bit smaller devices
    
    This patch makes the code to provide modalias in sysfs for usb devices
    56 bytes smaller in i386, while making it clear that the first part of
    the modalias string is the same no matter what the device class is.
    
    Signed-Off-By: Paulo Marques <pmarques@grupopie.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 58cfe9113e485f7e04bd0eac4fc4251b330af501
Author: Matthias Urlichs <smurf@smurf.noris.de>
Date:   Mon May 23 17:00:48 2005 -0700

    [PATCH] USB: add Option Card driver
    
    This patch adds a new driver for "Option" cards.  This is a GSM data card,
    controlled by three "serial ports" which are connected via an OHCI adapter,
    all located on an oversized PC-Card.  It's sold by several GSM service
    providers.
    
    Traditionally, this card has been accessed via the standard serial driver
    and appropriate vendor= and product= options.  However, testing has
    revealed several problems with this approach, including hung data transfers
    and lost data blocks when receiving.
    
    Therefore, I've written a separate driver.
    
    Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 4871d3be13ea2b33edc9ba6fbcc30fc047087be7
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu Jun 2 22:18:12 2005 -0700

    [PATCH] USB: add Vernier devices to HID blacklist
    
    They aren't really HID devices.
    
    Damm microsoft HID driver, that thing has caused more companies to have
    to do this kind of hack...
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit dc1d1003e8309ef8e5153ce0c00cce76144abbdb
Author: Lonnie Mendez <lmendez19@austin.rr.com>
Date:   Tue May 10 00:17:17 2005 -0500

    [PATCH] USB: hid-core: add Earthmate lt-20 productid to blacklist table
    
    This patch adds the DeLorme Earthmate lt-20 productid to the hid
    blacklist table.  This patch ensures the lt-20 can be claimed by the
    appropriate driver (cypress_m8).
    
    Adds the product id 0x200, of the DeLorme Earthmate lt-20, to the hid
    blacklist table.
    
    Signed-off-by: Lonnie Mendez <lmendez19@austin.rr.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 5ce0482e18193a15223911515ee44373cffb35b8
Author: Ping Cheng <pingc@wacom.com>
Date:   Thu May 5 15:12:57 2005 -0700

    [PATCH] USB: add new wacom device to usb hid-core list
    
    - add Intuos3 and Cintiq 21UX
    
    Signed-off-by: Ping Cheng <pingc@wacom.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit d7771a33bf2b23fc6d0b9c133fb0c00670154f10
Author: Adrian Bunk <bunk@stusta.de>
Date:   Thu May 5 18:49:59 2005 +0200

    [PATCH] USB: remove drivers/usb/media/pwc/ChangeLog
    
    This patch removes the outdated ChangeLog file for this driver.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit f4800078d9ed4bd20b1b27f56e7b68cfa0d73038
Author: Pete Zaitcev <zaitcev@redhat.com>
Date:   Sun May 1 16:05:40 2005 -0700

    [PATCH] USB: Support multiply-LUN devices in ub
    
    Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    
    diff -urp -X dontdiff linux-2.6.12-rc3/drivers/block/ub.c
linux-2.6.12-rc3-lem/drivers/block/ub.c

commit aa447acb9291518506a1aec644db47fa6c6e36eb
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Thu Jun 2 17:39:49 2005 -0700

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

commit 5ba0eac6e0b7e2889649a1105d97c600595e2bb1
Author: Jiri Benc <jbenc@suse.cz>
Date:   Thu Jun 2 16:48:05 2005 -0700

    [NET]: Fix HH_DATA_OFF.
    
    When the hardware header size is a multiple of HH_DATA_MOD, HH_DATA_OFF()
    incorrectly returns HH_DATA_MOD (instead of 0). This affects ieee80211 layer
    as 802.11 header is 32 bytes long.
    
    Signed-off-by: Jiri Benc <jbenc@suse.cz>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b597ef4712c05c962640a655386a7f06cc1a1fbc
Author: Christoph Hellwig <hch@lst.de>
Date:   Thu Jun 2 16:36:00 2005 -0700

    [NET]: Fix locking in shaper driver.
    
     o use a semaphore instead of an opencoded and racy lock
     o move locking out of shaper_kick and into the callers - most just
       released the lock before calling shaper_kick
     o remove in_interrupt() tests.  from ->close we can always block, from
       ->hard_start_xmit and timer context never
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 317604633eface11cb7452298fa44a34624633dc
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Thu Jun 2 16:07:03 2005 -0700

    Merge of 'docs' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

commit d7aaf48128ec7fcefcee92ea22833afc1a80e268
Author:  <jgarzik@pretzel.yyz.us>
Date:   Thu Jun 2 18:43:09 2005 -0400

    Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

commit decc6d0b68f27bbb8a0357fccf41936a3c196b03
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Thu Jun 2 18:42:33 2005 -0400

    libata: kernel-doc warning fixes

commit 0baab86b00cdf9785ac2bb2ce1ab63995b3866ca
Author: Edward Falk <efalk@google.com>
Date:   Thu Jun 2 18:17:13 2005 -0400

    libata: update inline source docs

commit 0fd56f67890acf7904c83e7de6cb71723eb1c962
Author: Adrian Bunk <bunk@stusta.de>
Date:   Thu Jun 2 14:04:00 2005 -0700

    [PATCH] drivers/net/hamradio/baycom_epp.c: cleanups
    
    The times when tricky goto's produced better codes are long gone.
    
    This patch should express the same in a better way.
    
    (Also fixes the final gcc-4.0 x86 compile error)
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c4eb2a93319d61923635c84a5f5e68965b14c754
Author: Anton Blanchard <anton@samba.org>
Date:   Thu Jun 2 14:02:03 2005 -0700

    [PATCH] ppc64: remove decr_overclock
    
    Now that we have HZ=1000 there is much less of a need for decr_overclock.
    Remove it.
    
    Leave spread_lpevents but move it into iSeries_setup.c.  We should look at
    making event spreading the default some day.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 6dc2f0c7df6cefda5932ac8bcd9ca5ef45de36ee
Author: Anton Blanchard <anton@samba.org>
Date:   Thu Jun 2 14:02:02 2005 -0700

    [PATCH] ppc64: cleanup iseries runlight support
    
    The iseries has a bar graph on the front panel that shows how busy it is.
    The operating system sets and clears a bit in the CTRL register to control
    it.
    
    Instead of going to the complexity of using a thread info bit, just set and
    clear it in the idle loop.
    
    Also create two helper functions, ppc64_runlatch_on and ppc64_runlatch_off.
    
    Finally don't use the short form of the SPR defines.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 79f1248962cfa1e11a5610e0349bc3515687516d
Author: Anton Blanchard <anton@samba.org>
Date:   Thu Jun 2 14:02:02 2005 -0700

    [PATCH] ppc64: cleanup SPR definitions
    
    There are a bunch of irrelevant SPR definitions in asm/processer.h.  Cut
    them down a bit, also add a DABR_TRANSLATION define which will be used
    shortly.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 7e3b11a9be6ac94bf4af81757b6a10e7e65b846f
Author: Jan Kara <jack@suse.cz>
Date:   Thu Jun 2 14:02:01 2005 -0700

    [PATCH] ext3: fix list scanning in __cleanup_transaction
    
    Fix a bug in list scanning that can cause us to skip the last buffer on the
    checkpoint list (and hence fail to do any progress under some rather
    unfavorable conditions).
    
    The problem is we first do jh=next_jh and then test
    
    	} while (jh!=last_jh);
    
    Hence we skip the last buffer on the list (if it was not the only buffer on
    the list).  As we already do jh=next_jh; in the beginning of the loop we
    are safe to just remove the assignment in the end.  It can happen that 'jh'
    will be freed at the point we test jh != last_jh but that does not matter
    as we never *dereference* the pointer.
    
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 00ea81459c279f14a7b344320a71c94f60f88929
Author: Jan Kara <jack@suse.cz>
Date:   Thu Jun 2 14:02:00 2005 -0700

    [PATCH] ext3: fix log_do_checkpoint() assertion failure
    
    Fix possible false assertion failure in log_do_checkpoint().  We might fail
    to detect that we actually made a progress when cleaning up the checkpoint
    lists if we don't retry after writing something to disk.  The patch was
    confirmed to fix observed assertion failures for several users.
    
    When we flushed some buffers we need to retry scanning the list.
    Otherwise we can fail to detect our progress.
    
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 4fef0304eeaa4156db5625e3578f92ed94645a43
Author: Adrian Bunk <bunk@stusta.de>
Date:   Thu Jun 2 13:06:36 2005 -0700

    [IPV6]: Kill export of fl6_sock_lookup.
    
    There is no usage of this EXPORT_SYMBOL in the kernel.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Acked-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a2c1aa54746bace5d03cc66521fbf3bb6fb2f916
Author: Jesper Juhl <juhl-lkml@dif.dk>
Date:   Thu Jun 2 13:04:07 2005 -0700

    [ATM]: [drivers] kill pointless NULL checks and casts before kfree()
    
    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3087e1ff8d64da7b6b527e89d0c0864ab36294b8
Author: Jan Beulich <jbeulich@novell.com>
Date:   Thu Jun 2 13:03:15 2005 -0700

    [ATM]: fix ATM makefile for out-of-source-tree builds
    
    Signed-off-by: Jan Beulich <jbeulich@novell.com>
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 64a6c7aa3836e357499d2e822388f30c11f13604
Author: Adrian Bunk <bunk@stusta.de>
Date:   Thu Jun 2 13:02:25 2005 -0700

    [IPVS]: remove net/ipv4/ipvs/ip_vs_proto_icmp.c
    
    ip_vs_proto_icmp.c was never finished.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1e86d1c648508fd50e6c9960576b87906a7906ad
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Thu Jun 2 14:11:37 2005 +1000

    [PATCH] ppc64: Fix result code handling in prom_init
    
    prom_init(), the trampoline code that "talks" to Open Firmware during
    early boot, has various issues with managing OF result codes. Some of my
    recent fixups in fact made the problem worse on some platforms.
    
    This patch reworks it all. Tested on g5, Maple, POWER3 and POWER5.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 19:17:59 2005 -0700

    Merge of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

commit 16a789c11df5069576ef89f817348dbc6f3bd87e
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 16:32:03 2005 -0700

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

commit d8caebd285a084ee1e4d484ce597865228614067
Author: Peter Chubb <peterc@gelato.unsw.edu.au>
Date:   Tue May 31 22:37:00 2005 -0700

    [IA64] fix compilation warning in sys32_epoll_wait()
    
    This gets rid of an unused variable `error' in sys_ia32.c:sys32_epoll_wait()
    
    Getting rid of this one makes parsing the output of the kernecomp
    autobuild easier --- searching for `Error' to find a problem kept
    hitting this one, even though it's only a warning.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit b655913bf364603d17ad770dc4fb80e60555a255
Author: Peter Chubb <peterc@gelato.unsw.edu.au>
Date:   Tue May 31 22:34:00 2005 -0700

    [IA64] Cleanup compile warnings for ski config
    
    The attached patch cleans up a compilation warning when ACPI
    is turned off (i.e., when compiling for the Ski simulator).
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 72a95d14f5047d9efb1e82a9f0b9f230f06d6e3d
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 13:21:58 2005 -0700

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

commit f9a22239257561df80ef54fc8f31880e2fb2a27b
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 13:20:35 2005 -0700

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

commit eff910a91ac04ab1d9e210d4f721484af3b39c8d
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 07:56:33 2005 -0700

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

commit a340ba1071ccec7da5d5c689471ff8bc07fe022d
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 07:56:10 2005 -0700

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6

commit c10fccddf00cb216349ce3171ce2e39d7c70371b
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed Jun 1 07:55:46 2005 -0700

    Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

commit 5f64f73957f6cae3222f97f2599199ee562f7f3f
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Wed Jun 1 17:07:27 2005 +1000

    [PATCH] ppc32/ppc64: cleanup /proc/device-tree
    
    This cleans up the /proc/device-tree representation of the Open Firmware
    device-tree on ppc and ppc64.  It does the following things:
    
     - Workaround an issue in some Apple device-trees where a property may
       exist with the same name as a child node of the parent.  We now
       simply "drop" the property instead of creating duplicate entries in
       /proc with random result...
    
     - Do not try to chop off the "@0" at the end of a node name whose unit
       address is 0.  This is not useful, inconsistent, and the code was
       buggy and didn't always work anyway.
    
     - Do not create symlinks for the short name and unit address parts of a
       node.  These were never really used, bloated the memory footprint of
       the device-tree with useless struct proc_dir_entry and their matching
       dentry and inode cache bloat.
    
    This results in smaller code, smaller memory footprint, and a more
    accurate view of the tree presented to userland.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f93ea2349832c040bdf66dc7495aa87bfe3394b8
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Wed Jun 1 17:02:22 2005 +1000

    [PATCH] ppc32: Apple device-tree bug fix
    
    This is the ppc32 patch equivalent to the just posted ppc64 one working
    around a bug in Apple device-trees regarding the "cpus" nodes.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 44e4665cc9d856d15f04a012c78e4ab48f71290b
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Wed Jun 1 14:54:25 2005 +1000

    [PATCH] ppc64: Fix a device-tree bug on Apple's
    
    Apple's Open Firmware has a funny bug when creating the /cpus nodes
    where it leaves a dangling '\0' character in the CPU name which ends up
    appearing in the full path of the node. This is bogus and
    confuses /proc/device-tree badly.
    
    This patch strips those bogus zero's from the node full path when
    reading the device-tree from Open Firmware. The "name" property is not
    modified and still contains the spurrious 0 (it basically contains 0
    tailing 0 instead of one) but that shouldn't be a problem.
    
    An equivalent patch for ppc32 will follow shortly
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 88314ee73fd75eb32abdcb3119cd303c116d4500
Author: David S. Miller <davem@davemloft.net>
Date:   Tue May 31 19:13:52 2005 -0700

    [SPARC64]: Refine PCI strbuf ctx-based flush.
    
    The initial peek read PIO of the match register is just a waste.
    Just do the flush writes first, as that is more efficient.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 21e3024cbddb712f6a078bf4132d7682d3c4e35e
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed May 25 14:43:56 2005 -0700

    [PATCH] cpufreq-stats driver documentation
    
    Documentation for cpufreq stats.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 58f1df25403988b73d7129fcd2c4d4c24017f1af
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed May 25 14:46:50 2005 -0700

    [PATCH] cpufreq-stats driver updates
    
    Changes to the cpufreq stats driver:
    * Changes the way P-state transition table looks in /sysfs providing more
      clear output
    * Changes the time unit in the output from HZ to clock_t
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit f94ea640a28230f82a4395c34e1290748a9f6586
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:52 2005 -0700

    [CPUFREQ] Typos.
    
    cpfureq developers cant spel.
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 6778bae0f2f1d4af1b8bb876c992ea094ee958b4
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:51 2005 -0700

    [CPUFREQ] longhaul - adjust transition latency.
    
    From patch by: Ken Staton <ken_staton@agilent.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 1174631418fbb2c0c6946081b0b7d391f5d92861
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:51 2005 -0700

    [CPUFREQ] Longhaul: Magic timer frobbing.
    
    As mandated by the spec, disable timer around transitions.
    
    From code by : Ken Staton <ken_staton@agilent.com
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 3be6a48f3c8df1b2fbbe57face95a03d167bda1b
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:51 2005 -0700

    [CPUFREQ] longhaul - disable PCI mastering around transition.
    
    The spec states that we have to do this, which is *horrid*.
    
    Based on code from: Ken Staton <ken_staton@agilent.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit e131832ca7d3a3e5f9c7624bb310a7747dc2b57c
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:50 2005 -0700

    [CPUFREQ] ondemand governor default sampling downfactor as 1
    
    [PATCH] [5/5] ondemand governor default sampling downfactor as 1
    
    Make default sampling downfactor 1.
    This works better with earlier auto downscaling change in ondemand governor.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit c29f1403098135bdef75b190a5037db514701031
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:50 2005 -0700

    [CPUFREQ] ondemand governor automatic downscaling
    
    [PATCH] [4/5] ondemand governor automatic downscaling
    
    Here is a change of policy for the ondemand governor. The modification
    concerns the frequency downscaling. Instead of decreasing to a lower
    frequency when the CPU usage is under 20%, this new policy automatically
    scales to the optimal frequency. The optimal frequency being the lowest
    frequency which provides enough power to not trigger the upscaling policy.
    
    Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 9c7d269b9b05440dd0fe92d96f4e5d7e73dd7238
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:49 2005 -0700

    [CPUFREQ] ondemand,conservative governor idle_tick clean-up
    
    [PATCH] [3/5] ondemand,conservative governor idle_tick clean-up
    
    Ondemand and conservative governor clean-up, it factorises the idle ticks 
    measurement.
    
    Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 790d76fa979f55bfc49a6901bb911778949b582d
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:49 2005 -0700

    [CPUFREQ] ondemand,conservative governor store the idle ticks for all cpus
    
    [PATCH] [2/5] ondemand,conservative governor store the idle ticks for all cpus
    
    Ondemand, conservative governor did not store prev_cpu_idle_up into 
    prev_cpu_idle_down for other CPUs than the current CPU.
    
    Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit dac1c1a56279b4545a822ec7bc770003c233e546
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:49 2005 -0700

    [CPUFREQ] ondemand,conservative minor bug-fix and cleanup
    
    [PATCH] [1/5] ondemand,conservative minor bug-fix and cleanup
    
    Attached patch fixes some minor issues with Alexander's patch and related
    cleanup in both ondemand and conservative governor.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 1206aaac285904e3e3995eecbf4129b6555a8973
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:48 2005 -0700

    [CPUFREQ] Allow ondemand stepping to be changed by user.
    
    Adds support so that the cpufreq change stepping is no longer fixed at 5% and
    can be changed dynamically by the user
    
    Signed-off-by: Alexander Clouter <alex-kernel@digriz.org.uk>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit c11420a616039e2181e4ecbffb4d125d39e6877d
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:48 2005 -0700

    [CPUFREQ] Prevents un-necessary cpufreq changes if we are already at min/max
    
    Signed-off-by: Alexander Clouter <alex-kernel@digriz.org.uk>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 3d5ee9e55d13de28d2fa58d6e13f2e4d3a5f8b1a
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:47 2005 -0700

    [CPUFREQ] Add support to cpufreq_ondemand to ignore 'nice' cpu time
    
    Signed-off-by: Alexander Clouter <alex-kernel@digriz.org.uk>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit b9170836d1aa4ded7cc1ac1cb8fbc7867061c98c
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:47 2005 -0700

    [CPUFREQ] Conservative cpufreq governer
    
    A new cpufreq module, based on the ondemand one with my additional patches
    just posted.  This one is more suitable for battery environments where its
    probably more appealing to have the cpu freq gracefully increase and decrease
    rather than flip between the min and max freq's.
    
    N.B. Bruno Ducrot pointed out that the amd64's "do have unacceptable latency
    between min and max freq transition, due to the step-by-step requirements
    (200MHz IIRC)"; so AMD64 users would probably benefit from this too.
    
    Signed-off-by: Alexander Clouter <alex-kernel@digriz.org.uk>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit b53cc6ead046093477ec7a3354d620337101ea5b
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:47 2005 -0700

    [CPUFREQ] fix up comment in cpufreq.h
    
    Fix up comment in cpufreq.h stating transition latency should be passed
    in microseconds -- it was decided long ago to switch to nanoseconds.
    
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 065b807ca1f5bdbeb081e3cf75ac8de9be8ac212
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:46 2005 -0700

    [CPUFREQ] dual-core powernow-k8
    
    With the release of the dual-core AMD Opterons last week,
    it's high time that cpufreq supported them.  The attached
    patch applies cleanly to 2.6.12-rc3 and updates powernow-k8
    to support the latest Athlon 64 and Opteron processors.
    
    Update the driver to version 1.40.0 and provide support
    for dual-core processors.
    
    Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
    Signed-off-by: Dave Jones <davej@redhat.com>

commit 7f335d4ef2d50a693fad70b8fa053d0382f4a45c
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:46 2005 -0700

    [CPUFREQ] make cpufreq_gov_dbs static
    
    This patch makes a needlessly global and EXPORT_SYMBOL'ed struct static.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit c5d28fb297efaa97c4b90e36f9dff3066e7f2778
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:46 2005 -0700

    [CPUFREQ] Recalibrate cpu_khz [2/2]
    
    Some cpufreq drivers (at that time, only powernow-k7) need to recalibrate the
    cpu_khz at runtime.
    
    Signed-off-by: Bruno Ducrot <ducrot@poupinou.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 91350ed49bf3613e243c2e216228cd4ae8f32516
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:45 2005 -0700

    [CPUFREQ] Recalibrate cpu_khz [1/2]
    
    We have to recalibrate cpu_khz in order to use the current FID instead the max
    FID since some BIOS do not put the processor at maximum frequency at POST. 
    Also, some BIOS will change the processor frequency at our back after cpu_khz
    was calibrate.  Finally, this will fix a long standing bug when we do
    something like this:
    
    # rmmod powernow-k7
    # modprobe powernow-k7
    
    Signed-off-by: Bruno Ducrot <ducrot@poupinou.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit bf6fc9fd2d848d06b8f6c4caccef1dba9ef8c4c6
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:45 2005 -0700

    [CPUFREQ] AMD Elan SC520 cpufreq driver.
    
    From: Sean Young <sean@mess.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 3310010818aa12145905faf97ffe3742acc842e2
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:44 2005 -0700

    [CPUFREQ] Add warning comment about default governors.
    
    This comes up time and time again. Until its fixed, place this
    comment in the Kconfig which should stem the flow of resubmissions.
    
    Signed-off-by: Rob Weryk <rjweryk@uwo.ca>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 6f4095af6df7aa365ecf18473c8b05c5f6c38a78
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:44 2005 -0700

    [CPUFREQ] speedstep-smi: it works on at least one P4M
    
    The speedstep-smi driver actually works on >=1 notebook with a
    Pentium 4-M CPU where all other cpufreq drivers fail. Therefore,
    allow speedstep-smi on P4Ms again, but warn users of likely failure
    
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 6fe711658fcf92d39d84c0b7e6332ed6625dc520
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:44 2005 -0700

    [CPUFREQ] ondemand: trivial clean-ups
    
    Trivial ondemand governor clean-ups:
    - change from sampling_rate_in_HZ() to the official function
    usecs_to_jiffies().
    - use for_each_online_cpu() to instead of using "if (cpu_online(i))"
    
    Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 8282864a96ef0a7b88ee9e4b357e08504131394d
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:43 2005 -0700

    [CPUFREQ] speedstep-centrino: Pentium 4 - M (HT) support
    
    The Pentium 4 - Ms (HT) with CPUID 0xF34 and 0xF41 seem to support
    centrino-like enhanced speedstep; however, no "table" support is possible.
    Therefore, put NULL entries into speedstep-centrino.c
    
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 78ee998fd46ed4cc647ee442d2a5492f389ee27a
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:43 2005 -0700

    [CPUFREQ] cpufreq-core: reduce warning messages.
    
    cpufreq core is printing out messages at KERN_WARNING level that the core
    recovers from without intervention, and that the system administrator can
    do nothing about.  Patch below reduces the severity of these messages to
    debug.
    
    Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 7eb53d88230e23f83b2e20a78955e1412fa7bb26
Author: Dave Jones <davej@redhat.com>
Date:   Tue May 31 19:03:42 2005 -0700

    [CPUFREQ] powernow-k7: don't print khz element of FSB.
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    

commit 92bab26be5544d8b495389646490fcfdca6dbcf2
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Tue May 31 20:43:57 2005 -0400

    libata: more docs updates

commit 36839836e8132731e0cadddce452423036a1d5b3
Author: Edgar E Iglesias <edgar@axis.com>
Date:   Tue May 31 17:08:05 2005 -0700

    [IPSEC]: Fix esp_decap_data size verification in esp4.
    
    Signed-off-by: Edgar E Iglesias <edgar@axis.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7c963ad1d113790a8c723a178988b675868f3abe
Author: David S. Miller <davem@davemloft.net>
Date:   Tue May 31 16:57:59 2005 -0700

    [SPARC64]: Fix streaming buffer flushing on PCI and SBUS.
    
    Firstly, if the direction is TODEVICE, then dirty data in the
    streaming cache is impossible so we can elide the flush-flag
    synchronization in that case.
    
    Next, the context allocator is broken.  It is highly likely
    that contexts get used multiple times for different dma
    mappings, which confuses the strbuf flushing code and makes
    it run inefficiently.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 08e9cd1fc559c00bc05df3fc551efe3b87c57ee3
Author: Thomas Graf <tgraf@suug.ch>
Date:   Tue May 31 15:17:28 2005 -0700

    [PKT_SCHED]: Disable dsmark debugging messages by default
    
    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 486b53e59ca8cd07d91ad88375c1c884b15cc9bd
Author: Thomas Graf <tgraf@suug.ch>
Date:   Tue May 31 15:16:52 2005 -0700

    [PKT_SCHED]: make dsmark try using pfifo instead of noop while grafting
    
    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0451eb074eef30240c6c06dacf2911bee26831e1
Author: Thomas Graf <tgraf@suug.ch>
Date:   Tue May 31 15:15:58 2005 -0700

    [PKT_SCHED]: Fix dsmark to count ignored indices while walking
    
    Unused indices which are ignored while walking must still
    be counted to avoid dumping the same index twice.
    
    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e74d633dc5f56bf059f870370b2f36b021298652
Author: Goffredo Baroncelli <kreijack@inwind.it>
Date:   Tue May 31 14:39:31 2005 -0700

    [PATCH] UDF filesystem: array '__mon_yday' declared as not static
    
    in fs/udf/udftime.c the global array '__mon_yday' is not static, and it
    conflicts with the glibc one when the kernel is compiled as user mode.
    
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 97d3a00f77fa527886d53dd943017654ce142186
Author: Peter Chubb <peterc@gelato.unsw.edu.au>
Date:   Tue May 31 14:39:30 2005 -0700

    [PATCH] pcdp.c build fix
    
    In file included from drivers/firmware/pcdp.c:18:
    drivers/firmware/pcdp.h:48: error: field `addr' has incomplete type
    drivers/firmware/pcdp.c: In function `setup_serial_console':
    drivers/firmware/pcdp.c:27: error:  `ACPI_ADR_SPACE_SYSTEM_MEMORY' undeclared (first use in
this  function)
    
    Cc: <tony.luck@intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit ae92ef8a442421356950a0a8dfdc35e8e783000e
Author: Roman Zippel <zippel@linux-m68k.org>
Date:   Tue May 31 14:39:29 2005 -0700

    [PATCH] flush icache in correct context
    
    flush_icache_range() is used in two different situation - in binfmt_elf.c &
    co for user space mappings and module.c for kernel modules.  On m68k
    flush_icache_range() doesn't know which data to flush, as it has separate
    address spaces and the pointer argument can be valid in either address
    space.
    
    First I considered splitting flush_icache_range(), but this patch is
    simpler.  Setting the correct context gives flush_icache_range() enough
    information to flush the correct data.
    
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f50734569c25c4e902bd3d0fb2e5bd93a200cc75
Author: Anton Blanchard <anton@samba.org>
Date:   Tue May 31 14:39:29 2005 -0700

    [PATCH] ppc64: allow timer based profiling on iseries
    
    We used to have an iseries specific profiler that used /proc/profile.  Now
    thats gone we can use the generic timer based stuff.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 2e214953295dd33fc62d43ac7ec91997afad75bb
Author: Nick Piggin <nickpiggin@yahoo.com.au>
Date:   Tue May 31 14:39:28 2005 -0700

    [PATCH] h8300 sleep problem
    
    h8300 appears to sleep (halt) when need_resched IS set.
    
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit adaa765d76f58b47e10a4760f2c0bc86de5479b9
Author: Alexander Nyberg <alexn@telia.com>
Date:   Tue May 31 14:39:27 2005 -0700

    [PATCH] acpi build fix: x86 setup.c
    
    This is a neverending story
    
    linux/acpi.h contains empty declarations for acpi_boot_init() &
    acpi_boot_table_init() but they are nested inside #ifdef CONFIG_ACPI.
    
    So we'll have to #ifdef in arch/i386/kernel/setup.c: setup_arch()
    
    Signed-off-by: Alexander Nyberg <alexn@telia.com>
    Cc: "Brown, Len" <len.brown@intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026
Author: Andi Kleen <ak@suse.de>
Date:   Tue May 31 14:39:26 2005 -0700

    [PATCH] x86_64 CONFIG_ACPI=n build fix
    
    Make CONFIG_X86_PM_TIMER dependent on CONFIG_ACPI
    
    Signed-off-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8d91640606c47551771a9b27664f249f4b176613
Author: Andi Kleen <ak@suse.de>
Date:   Tue May 31 14:39:26 2005 -0700

    [PATCH] x86_64: More fixes for compilation without CONFIG_ACPI
    
    Suggested by Alexander Nyberg
    
    Signed-off-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit bcc488ab02254a6e60d749187a632dc3d642d4f8
Author: Scott Murray <scottm@somanetworks.com>
Date:   Fri May 27 16:48:52 2005 -0400

    [PATCH] PCI Hotplug: more CPCI updates
    
    Here is my third attempt at a patch to further update the CompactPCI
    hotplug driver infrastructure to address the pci_enable_device issue
    discussed on the list as well as a few other issues I discovered during
    some more testing.  This version addresses a few more issues pointed out
    by Prarit Bhargava.  Changes include:
    - cpci_enable_device and its recursive calling of pci_enable_device on
      new devices removed.
    - Use list_rwsem to avoid slot status change races between disable_slot
      and check_slots.
    - Fixed oopsing in cpci_hp_unregister_bus caused by calling list_del on
      a slot after calling pci_hp_deregister.
    - Removed kfree calls in cleanup_slots since release_slot will have
      done it already.
    - Reworked init_slots a bit to fix latch and adapter file updating on
      subsequent calls to cpci_hp_start.
    - Improved sanity checking in cpci_hp_register_controller.
    - Now shut things down correctly in cpci_hotplug_exit.
    - Switch to pci_get_slot instead of deprecated pci_find_slot.
    - A bunch of CodingStyle fixes.
    
    Signed-off-by: Scott Murray <scottm@somanetworks.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit af00f9811e0ccbd3db84ddc4cffb0da942653393
Author: Andy Currid <acurrid@nvidia.com>
Date:   Mon May 23 08:55:45 2005 -0700

    [PATCH] PCI: amd74xx patch for new NVIDIA device IDs
    
    Here's the 2.6 amd74xx patch for NVIDIA MCP51.
    
    Signed-off-by: Andy Currid <acurrid@nvidia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2ac2610b26c9da72820443328ff2c56c7b8c87b8
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Fri May 27 16:08:14 2005 +0900

    [PATCH] PCI Hotplug: SHPCHP driver doesn't enable PERR and SERR properly
    
    Current shpchp driver doesn't seem to program command register to
    enable PERR and SERR properly. The following patch fixes this issue.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 7a8cb869f31de525bc34095f51f8c8a43ffcb6a9
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Mon May 23 19:50:32 2005 +0900

    [PATCH] PCI Hotplug: shpchp driver doesn't program _HPP values properly
    
    Current shpchp driver doesn't seem to program _HPP values
    properly. The following patch fixes this issue.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 06299db3e7f857a4985cf70dc1a5049ec12482c1
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 26 05:55:55 2005 -0700

    [PATCH] USB: fix usb-serial generic initialization
    
    At module load time, if a generic device is found, the tty information
    for the device is not set up properly (as the tty structures aren't initialized
    yet.)  This can cause big problems for things like udev.  This patch fixes this.
    
    Thanks to Kay Sievers for the original patch for this problem.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 47900743a56dc41a053107d64054aca3e1b42157
Author: Ian Abbott <abbotti@mev.co.uk>
Date:   Tue May 17 15:12:13 2005 +0100

    [PATCH] USB: ftdi_sio: new PID for ELV UM100
    
    ftdi_sio: Add PID for "ELV USB Module UM100".
    PID sent by Armin Laugher.
    
    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c6de2b64eb575a3f9326969ec5fcdc6032b38e42
Author: David Brownell <david-b@pacbell.net>
Date:   Thu May 26 05:55:55 2005 -0700

    [PATCH] USB: add sl811_cs support
    
    This adds support for a CF-card USB Host adapter, the Ratoc REX-CFU1U, by
    wrapping a PCMCIA driver around the existing "sl811-hcd" platform driver.
    
    This CF card is especially useful for PDAs, which currently tend to have
    no other solution for USB host capability.
    
    From: Botond Botyanszki <boti@rocketmail.com>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 1e9a47b62f7daf5a94fdd74a94dd4e076f44909a
Author: David Brownell <david-b@pacbell.net>
Date:   Thu May 26 05:55:55 2005 -0700

    [PATCH] USB: sl811-hcd fixes
    
    Various fixes to the sl811-hcd driver:
    
      * Fix small glitches that crept in during recent evolution of usbcore's hcd
        glue layer, coupling endpoint state records to usbcore and active urbs.
        (As noted by folk whose boards weren't stuck on 2.6.9 kernels...)
    
      * Cope with various system-specific issues:
          - Some configurations (e.g. a CF-card uses this chip) have iospace
            addresses for the two registers, rather than memory mapped ones.
          - Some configurations do interesting things with IRQs; maybe the
            line is shared, or it doesn't support level triggering.
          - Not all boards can drive the chip reset line in software.
    
      * Address a potential race during unlinking.
    
      * Tweak probe/remove section info to handle the case where this segment
        of a platform bus is hotpluggable (e.g. CF card).  (The basic problem
        is that CONFIG_HOTPLUG is global, which is wrong since not all busses
        can hotplug even on hotplug-friendly systems...)  Also export the
        driver, so that the CF driver can depend on it.
    
    Also removed some annoying end-of-line whitespace.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 4a4e5787e0b721021fe0a456ddc987a04cebfc8d
Author: R.Marek@sh.cvut.cz <R.Marek@sh.cvut.cz>
Date:   Thu Apr 21 09:07:56 2005 +0000

    [PATCH] I2C: ALI1563 SMBus driver fix
    
    This patch fixes "grave" bugs in i2c-ali1563 driver. It seems on recent
    chipset revisions the HSTS_DONE is set only for block transfers, so we
    must detect the end of ordinary transaction other way. Also due to missing
    and mask, setting other transfer modes was not possible. Moreover the
    continous byte mode transfer uses DAT0 for command rather than CMD command.
    All those changes were tested with help of Chunhao Huang from Winbond.
    
    I'm willing to maintain the driver. Second patch adds me as maintainer
    if this is neccessary.
    
    Signed-Off-By: Rudolf Marek <r.marek@sh.cvut.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Tue May 31 11:07:54 2005 -0700

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

commit fffcc150a21853651ea890a605832c5cccbb6279
Author: Tony Luck <tony.luck@intel.com>
Date:   Tue May 31 10:38:32 2005 -0700

    [IA64] Use "PER_CPU" form of EXPORT macro
    
    I was gently reminded that there are per-cpu forms of the EXPORT_SYMBOL macros.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 4e7c6816d680d1945916db047a47847afe4b9b02
Author: Jens Axboe <axboe@suse.de>
Date:   Tue May 31 17:47:36 2005 +0200

    [PATCH] Relax idecd dma alignment check
    
    Only the address needs alignment of mask bits, length should work with
    a relaxed alignment check.
    
    Signed-off-by: Jens Axboe <axboe@suse.de>
    
    [ This is take 2: make the length check be for 16-byte alignment, not
      just word alignment.  That should hopefully keep everybody happy,
      while still allowing CD writing with DMA ]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 05fda3b1d88ebac1fc866fc3ed5b7ef5a4672fa6
Author: Paul Mackerras <paulus@samba.org>
Date:   Tue May 31 17:01:11 2005 +1000

    [PATCH] ppc64: actually call prom_send_capabilities
    
    When I sent in the patch adding the code for the kernel to tell the
    firmware about its capabilities on pSeries machines, I included the
    function to give the capabilities to firmware but somehow forgot the
    hunk that adds the call to the new function.  This patch adds the
    call.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 0cba632b737fc2de76934137b8dccf92d9fa4d19
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Mon May 30 19:49:12 2005 -0400

    libata: doc updates

commit 208d89843b7b03978d8e748b8b991c1be81c4f43
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Mon May 30 15:50:15 2005 -0700

    [IPV4]: Fix BUG() in 2.6.x, udp_poll(), fragments + CONFIG_HIGHMEM
    
    Steven Hand <Steven.Hand@cl.cam.ac.uk> wrote:
    > 
    > Reconstructed forward trace: 
    > 
    >   net/ipv4/udp.c:1334   spin_lock_irq() 
    >   net/ipv4/udp.c:1336   udp_checksum_complete() 
    > net/core/skbuff.c:1069   skb_shinfo(skb)->nr_frags > 1
    > net/core/skbuff.c:1086   kunmap_skb_frag()
    > net/core/skbuff.h:1087   local_bh_enable()
    > kernel/softirq.c:0140   WARN_ON(irqs_disabled());
    
    The receive queue lock is never taken in IRQs (and should never be) so
    we can simply substitute bh for irq.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9bb7bc942d3da606f184ac6a4dfc7e4d470c831b
Author: Harald Welte <laforge@netfilter.org>
Date:   Mon May 30 15:35:26 2005 -0700

    [NETFILTER]: Fix deadlock with ip_queue and tcp local input path.
    
    When we have ip_queue being used from LOCAL_IN, then we end up with a
    situation where the verdicts coming back from userspace traverse the TCP
    input path from syscall context.  While this seems to work most of the
    time, there's an ugly deadlock:
    
    syscall context is interrupted by the timer interrupt.  When the timer
    interrupt leaves, the timer softirq get's scheduled and calls
    tcp_delack_timer() and alike.  They themselves do bh_lock_sock(sk),
    which is already held from somewhere else -> boom.
    
    I've now tested the suggested solution by Patrick McHardy and Herbert Xu to
    simply use local_bh_{en,dis}able().
    
    Signed-off-by: Harald Welte <laforge@netfilter.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 780a87f71841932db8dbb0f1eb9daf3a973a6bd6
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Mon May 30 15:41:05 2005 -0400

    libata: more doc updates
    
    Document recently-added ata_port_operations hooks.
    
    Fill several doc stubs in libata-core.c.

commit 07dd39b9f62e0532c6922459c3a26d54a07bc231
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Mon May 30 13:15:52 2005 -0400

    libata: minor DocBook update

commit 5e485b7975472ba4a408523deb6541e70c451842
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Sun May 29 22:39:38 2005 -0700

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

commit acf0f100e95516e2ba5a3353c3b86dbcd159e3d1
Author: David S. Miller <davem@sunset.davemloft.net>
Date:   Sun May 29 21:25:01 2005 -0700

    Merge of /home/davem/src/GIT/tg3-2.6/

commit d1102b59ca7b3a3c58912330a4ae38f549c8d569
Author: David S. Miller <davem@davemloft.net>
Date:   Sun May 29 20:28:25 2005 -0700

    [NET]: Use %lx for netdev->features sysfs formatting.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6c94d3611be61e4cff33b311f1a626d93d1d3e92
Author: David S. Miller <davem@davemloft.net>
Date:   Sun May 29 20:28:01 2005 -0700

    [IPV6]: Clear up user copy warning in flowlabel code.
    
    We are intentionally ignoring the copy_to_user() value,
    make it clear to the compiler too.
    
    Noted by Jeff Garzik.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 69f6a0fafcdf0bfe85af182695d6d38f80f9d549
Author: Jon Mason <jdmason@us.ibm.com>
Date:   Sun May 29 20:27:24 2005 -0700

    [NET]: Add ethtool support for NETIF_F_HW_CSUM.
    
    Signed-off-by: Jon Mason <jdmason@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 37e20a66db02eff9adbeee043af990cca85d0034
Author: Pravin B. Shelar <pravins@calsoftinc.com>
Date:   Sun May 29 20:26:44 2005 -0700

    [IPV4]: Kill MULTIPATHHOLDROUTE flag.
    
    It cannot work properly, so just ignore it in drr
    and rr multipath algorithms just like the random
    multipath algorithm does.
    
    Suggested by Herbert Xu.
    
    Signed-off by: Pravin B. Shelar <pravins@calsoftinc.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 79165121bc09c209451487d977df910c4ff6fc94
Author: Michael Ellerman <michael@ellerman.id.au>
Date:   Sun May 29 20:24:30 2005 -0700

    [NET]: Add is_multicast_ether_addr() in include/linux/etherdevice.h
    
    This patch adds is_multicast_ether_addr() to go along with
    is_valid_ether_addr() and friends. It then changes
    is_valid_ether_addr() to use the new macro, and fixes up the comment
    on that function to move implementation details out of the API doco.
    
    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8f937c6099858eee15fae14009dcbd05177fa91d
Author: Harald Welte <laforge@gnumonks.org>
Date:   Sun May 29 20:23:46 2005 -0700

    [IPV4]: Primary and secondary addresses
    
    Add an option to make secondary IP addresses get promoted
    when primary IP addresses are removed from the device.
    It defaults to off to preserve existing behavior.
    
    Signed-off-by: Harald Welte <laforge@gnumonks.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 79158229b09873ca296ac53de5c952488f944646
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Sun May 29 19:30:03 2005 -0700

    Automatic merge of 'misc-fixes' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

commit 1b62815193f6c20c60958e5347751155833e3d35
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:59:49 2005 -0700

    [TG3]: Fix bug in tg3_load_firmware_cpu
    
    Add tg3_nvram_lock() and tg3_nvram_unlock() calls around tg3_halt_cpu().
    It is possible that the bootcode may be loading code from nvram during
    this call and stopping the cpu without getting the lock may cause
    uncompleted nvram data to be left in the nvram data register. Subsequent
    calls to read/write nvram data will fail.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d4bc3927d284784b3f0bff05b4eed2242cc3e226
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:59:20 2005 -0700

    [TG3]: Add interrupt test
    
    This test uses the previously added tg3_test_interrupt() to perform the
    test.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c76949a6826fc11efcd6bb1abdca1ae02761071d
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:58:59 2005 -0700

    [TG3]: Add loopback test
    
    The test will loopback one packet in MAC loopback mode and verify the
    packet data.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7942e1dbd7252b480ed238096dca617189d293df
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:58:36 2005 -0700

    [TG3]: Add memory test
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a71116d1f3b85a69fe3a3acec9223fefb4b1fc66
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:58:11 2005 -0700

    [TG3]: Add register test
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 944d980ecaabe44616a9e2d50101ce774f517bb6
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:57:48 2005 -0700

    [TG3]: Add parameter to tg3_halt
    
    Add a reset kind parameter to tg3_halt() so that the RESET_KIND_SUSPEND
    parameter can be passed to tg3_halt() before doing offline tests.
    
    All other calls to tg3_halt() will use the RESET_KIND_SHUTDOWN
    parameter.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ca43007a92662621e5819912fc31c346e3a2eed8
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:57:23 2005 -0700

    [TG3]: Add link test
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 566f86adb336637d03900f53b886d879aa5f5d56
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:56:58 2005 -0700

    [TG3]: Add nvram test
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4cafd3f533475c976879d85773735c004f09f576
Author: Michael Chan <mchan@broadcom.com>
Date:   Sun May 29 14:56:34 2005 -0700

    [TG3]: Add basic selftest infrastructure
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7ce54e3f428b33af714271140601c87b8bf2c544
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Sun May 29 14:16:48 2005 -0700

    [BRIDGE]: receive path optimization
    
    This improves the bridge local receive path by avoiding going
    through another softirq.  The bridge receive path is already being called
    from a netif_receive_skb() there is no point in going through another
    receiveq round trip.
    
    Recursion is limited because bridge can never be a port of a bridge
    so handle_bridge() always returns.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 85967bb46dd1f8f2c49b85a313866c00ac0c9b59
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Sun May 29 14:15:55 2005 -0700

    [BRIDGE]: prevent bad forwarding table updates
    
    Avoid poisoning of the bridge forwarding table by frames that have been
    dropped by filtering. This prevents spoofed source addresses on hostile
    side of bridge from causing packet leakage, a small but possible security
    risk.
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 81d35307dd468b92fe8c58797abb13c62e3e64dd
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Sun May 29 14:15:17 2005 -0700

    [BRIDGE]: set features based on enslaved devices
    
    Make features of the bridge pseudo-device be a subset of the underlying
    devices.  Motivated by Xen and others who use bridging to do failover.
    
    Signed-off-by: Catalin BOIE <catab at umrella.ro>
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 81e8157583c559c27aac75c708d40a35f563d734
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Sun May 29 14:14:35 2005 -0700

    [BRIDGE]: make dev->features unsigned
    
    The features field in netdevice is really a bitmask, and bitmask's should
    be unsigned.
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d8a33ac435c43a1a404b2ec560ef1d1536710c36
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Sun May 29 14:13:47 2005 -0700

    [BRIDGE]: features change notification
    
    Resend of earlier patch (no changes) from Catalin used to provide
    device feature change notification.
    
    Signed-off-by: Catalin BOIE <catab at umbrella.ro>
    Acked-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7238cfb3342078ad6d1dd06c7b567da428672476
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Sun May 29 14:48:20 2005 -0400

    libata: bump version

commit d582c4ea307873503a68d6d7ab72ee8599e032a9
Author:  <jgarzik@pretzel.yyz.us>
Date:   Sun May 29 14:24:57 2005 -0400

    Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap

commit 45b30105e7231b70bb855923dbca443ee3ba44c3
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Sun May 29 10:40:13 2005 -0700

    Automatic merge of 'for-linus' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input

commit 7d6064d44bc79e328f2794ee7322ba2676511e2b
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sun May 29 01:27:44 2005 -0500

    Input: Fix fast scrolling scancodes in atkbd.c
    
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:15 2005 -0700

    [PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configured
    
    Trying to initialize the i8259 PIC will not work if CONFIG_PCI is not
    enabled.  The kernel hangs if the initialization is tried.
    
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f9e4a005827ec0b33f0c61fec1634a5a3421decd
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:15 2005 -0700

    [PATCH] ppc32: Add soft reset to MPC834x
    
    This change allows mpc83xx_restart to issue a software reset.
    
    Signed-off-by: Randy Vinson <rvinson@mvista.com>
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit ff945023c6a455679165b14d298316e262ceeb1f
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:14 2005 -0700

    [PATCH] ppc32: MPC834x BCSR_SIZE too small for use in a BAT.
    
    The call to io_block_mapping was creating an invalid BAT entry because the
    value of BCSR_SIZE (32K) is too small to be used in a BAT (128K min).  This
    change removes the io_block_mapping call since these registers can easily
    be mapped using ioremap at the point of use.
    
    Signed-off-by: Randy Vinson <rvinson@mvista.com>
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 92b4dc16257fef814ddf1c8d1d2a20f67f67ee4b
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:13 2005 -0700

    [PATCH] ppc32: Simplified load string emulation error checking
    
    The error checking for emulation of load string instructions was overly
    generous and would cause certain valid forms of the instructions to be
    treated as illegal.  We drop the range checking since the architecture
    allows this to be boundedly undefined.  Tests on CPUs that support these
    instructions appear not do cause illegal instruction traps on range errors
    and just allow the execution to occur.
    
    Thanks to Kim Phillips for debugging this and figuring out what real HW was
    doing.
    
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 91f9855a7afbb160ba1709bf342858732138abad
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:12 2005 -0700

    [PATCH] ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled
    
    The patch that introduced support for the VIA chipset broke building if
    CONFIG_PCI is disabled.
    
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit a6dbba77a9d4b47c60d60c4f07fa79b3ca93a1d5
Author: Vitaly Bordug <vbordug@ru.mvista.com>
Date:   Sat May 28 15:52:09 2005 -0700

    [PATCH] ppc32: Support for 82xx PQII on-chip PCI bridge
    
    This patch adds on-chip PCI bridge support for the PQ2 family.  The
    incomplete existent code is updated with interrupt handling stuff and
    board-specific bits for 8272ADS and PQ2FADS; the related files were renamed
    (from m8260_pci to m82xx_pci) to be of more generic fashion.  This is
    tested with 8266ADS and 8272ADS, should work on PQ2FADS as well.
    
    Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit ed36959621451da7195be83b87878b060ce64724
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:07 2005 -0700

    [PATCH] ppc32: Add VIA IDE support to MPC8555 CDS platform
    
    Add support for the VIA IDE controller that exists on the MPC8555 CDS
    system.  Updated the config for the system to enable support by default.
    
    Signed-off-by: Scott Hall <shall@mvista.com>
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 252fcaed48fc5473b3fc3cafbf977244b0cbf670
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:06 2005 -0700

    [PATCH] ppc32: Fix some minor issues related to FSL Book-E KGDB support
    
    Some debug registers needed to be initialized early on to allow proper
    support for KGDB.  Additionally, we need to setup the
    ppc.md_early_serial_map function pointer on boards that have serial support
    for KGDB.
    
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 94b9f46d61904422c498bf4cf9a90cc14398d311
Author: Kumar Gala <galak@freescale.com>
Date:   Sat May 28 15:52:05 2005 -0700

    [PATCH] ppc32: Fix uImage make target to report success correctly
    
    The existing make rule when building a uImage would check to see if the
    image file existed to report 'is ready' or 'not made'.  However make
    appeared to compute the file list before the rule was executed.
    
    Signed-off-by: Chris Clark <cpclark@xmission.com>
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8e21683bb458c73c6fe87844202a64eac730995e
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:52:04 2005 -0700

    [PATCH] uml: remove jail mode + other leftovers
    
    This var is currently useless, as it's apparent from reading the code. Until
    2.6.11 it was used in some code related to jail mode, in the same proc.:
    
            if(jail){
    		while(!reading) sched_yield();
    	}
    
    jail mode has been dropped, together with that use, so let's finish dropping
    this.
    
    Also, remove some other useless definitions I met.
    
    Acked-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f767b02f35a3db5c1b1c6454992c070510cef07f
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:52:03 2005 -0700

    [PATCH] uml: fixlet for arch_prctl_skas
    
    Fix it a bit (after some cross checking with "man arch_prctl"). There were:
    *) typos FS/GS and back
    *) FS in place of FS_BASE (and the same for GS)
    *) the procedure used put_user on &addr, where addr was the parameter (i.e.
    changed its param with put_user, completely useless) rather than interpreting
    addr as a pointer, as requested in this case (see the man page).
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8f28e8fa46625310102aea06fac61ba04c8b5b88
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:52:02 2005 -0700

    [PATCH] irq code: Add coherence test for PREEMPT_ACTIVE
    
    After porting this fixlet to UML:
    
    http://linux.bkbits.net:8080/linux-2.5/cset@41791ab52lfMu...
    
    , I've also added a warning which should refuse compilation with insane values
    for PREEMPT_ACTIVE...  maybe we should simply move PREEMPT_ACTIVE out of
    architectures using GENERIC_IRQS.
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 37053cc84d51a790a6e5c3987665902cdab122a5
Author: Paul Mundt <lethal@Linux-SH.ORG>
Date:   Sat May 28 15:52:01 2005 -0700

    [PATCH] sh: PREEMPT_ACTIVE fix
    
    Port Paulus's ppc64 fix to sh:
    
      When the generic IRQ stuff went in, it seems that HARDIRQ_BITS got bumped
      from 9 (for ppc64) up to 12.  Consequently, the PREEMPT_ACTIVE bit is now
      within HARDIRQ_MASK, and I get in_interrupt() falsely returning true when
      PREEMPT_ACTIVE is set, and thus a BUG_ON tripping in arch/ppc64/mm/tlb.c.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit affac4bcbba617d7329b04c7882bc49a9826e12f
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:52:00 2005 -0700

    [PATCH] uml: fix PREEMPT_ACTIVE
    
    This is a continuation for UML of:
    
    http://linux.bkbits.net:8080/linux-2.5/cset@41791ab52lfMu...
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b3461034d7d46455060c8476910be22b6b0fc313
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:52:00 2005 -0700

    [PATCH] uml: stack dump fix
    
    Copy (and adapt) to UML the stack code dumper used in i386 when
    CONFIG_FRAME_POINTER is enabled.
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 37fce857bec00d26d0e8251c909da2bd8736c949
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:51:59 2005 -0700

    [PATCH] uml: split CONFIG_FRAME_POINTER from DEBUG_INFO
    
    Until now, FRAME_POINTER was set = DEBUG_INFO for UML.  Change it to be the
    default way, so that it can be enabled alone (for instance to get better
    backtraces on crashes).  The call-trace dumper which uses the frame pointer is
    not yet in, I'm going to introduce it in a separate patch.
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 567b56508f7367e161d6d861ef214a900ab45ce9
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:51:58 2005 -0700

    [PATCH] uml: add MOD_LICENSE to random driver
    
    Add a MODULE_LICENSE("GPL") to the driver, remove some unused macros and add
    the GPL license (it's GPL-licensed anyway since it's a GPL-derivative, apart
    that Jeff Dike releases GPL software, in case anybody is wondering).
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 34a1a63e37ee8d60bdb842476d9337cdff5413d9
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:   Sat May 28 15:51:57 2005 -0700

    [PATCH] uml: add modversions support
    
    Actually, the real support was added by some earlier patches.  Now we simply
    re-enable the config.  option.  I've actually tested it and it works well.
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 7590d3ec1cda7d504c25103bde0c9911f93810e9
Author: Jeff Dike <jdike@addtoit.com>
Date:   Sat May 28 15:51:57 2005 -0700

    [PATCH] uml: remove unused code
    
    This removes two now unused files and a couple of unused functions.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 92515da73a5df50db45111b8659ac463b4800236
Author: Jeff Dike <jdike@addtoit.com>
Date:   Sat May 28 15:51:56 2005 -0700

    [PATCH] uml: fix segfault on exit with CONFIG_GCOV
    
    We need to disable signals on exit in all cases, not just when rebooting.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 0894e27e7999bdbad2e65734caa1d5de65e7d890
Author: Jeff Dike <jdike@addtoit.com>
Date:   Sat May 28 15:51:55 2005 -0700

    [PATCH] uml: single-space a help message
    
    One of the ubd driver help strings was bust.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit a2e4b972c99685d9d7b869c4bf8d8b258ff5b60c
Author: Jeff Dike <jdike@addtoit.com>
Date:   Sat May 28 15:51:54 2005 -0700

    [PATCH] uml: remove 2_5compat.h
    
    Remove old useless header that was used in Ye Olde Times during 2.4->2.5
    porting to abstract differences.  It's definitions are no more used anyway, so
    let's finally kill it.
    
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 6770cb61ff6d557613a8382b28f9b0a919fb112f
Author: Jeff Dike <jdike@addtoit.com>
Date:   Sat May 28 15:51:54 2005 -0700

    [PATCH] uml: turn off kmalloc always on a fatal signal
    
    We should turn off kmalloc when getting a fatal signal regardless of the mode
    we're in.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b9e0d0696c9e86d4e40b23039feefb8c377cb524
Author: Jeff Dike <jdike@addtoit.com>
Date:   Sat May 28 15:51:53 2005 -0700

    [PATCH] uml: fix a couple of warnings
    
    Eliminate an unused variable warning in ptrace.c and a size mismatch warning
    by adding a cast to __pa.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 226d97ec3e47b54ecc13f6ea3c300dc6a1b290c3
Author: Manu Abraham <manu@kromtek.com>
Date:   Sat May 28 15:51:52 2005 -0700

    [PATCH] dvb: Small cleanup
    
    Miscellaneous cleanup
    
    Signed-off-by: Manu Abraham <manu@kromtek.com>
    Cc: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 86360a3edeb6b7b6230dc13ef6835d2851409502
Author: Manu Abraham <manu@kromtek.com>
Date:   Sat May 28 15:51:51 2005 -0700

    [PATCH] dvb: Fix 22k tone control
    
    Signed-off-by: Manu Abraham <manu@kromtek.com>
    Cc: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8f6da8f166228c1720d16216a9d82d630c58de57
Author: Manu Abraham <manu@kromtek.com>
Date:   Sat May 28 15:51:51 2005 -0700

    [PATCH] dvb: Fix LNB power switching
    
    Signed-off-by: Manu Abraham <manu@kromtek.com>
    Cc: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 0eac3e486e1f246a9d59fee9251cc69e409cb58e
Author: Manu Abraham <manu@kromtek.com>
Date:   Sat May 28 15:51:50 2005 -0700

    [PATCH] dvb: Remove unnecessary casts
    
    Cleanup unnecessary (and undesirable) casts, demodulator_priv is already a
    void*.  Suggestion from Andrew Morton
    
    Signed-off-by: Manu Abraham <manu@kromtek.com>
    Cc: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 203fe8b3d1f5b1b527e86f6dbe5b75960acb7f4f
Author: Manu Abraham <manu@kromtek.com>
Date:   Sat May 28 15:51:48 2005 -0700

    [PATCH] dvb: Fix Mini DiSEqC bug
    
    The bug was visible as a warning with gcc-3.4.4 (prerelease)
    
    Message:
    drivers/media/dvb/bt8xx/dst.c:1349: warning: initialization from
    incompatible pointer type.
    
    Signed-off-by: Manu Abraham <manu@kromtek.com>
    Cc: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 5212dd58e67e4b8009107d69a9de45dd2e687496
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sat May 28 15:51:47 2005 -0700

    [PATCH] input: Fix fast scrolling scancodes in atkbd.c
    
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 346e399b2a3a01b323fa74a0937e2d855479833b
Author: Patrick McManus <mcmanus@ducksong.com>
Date:   Sat May 28 15:51:46 2005 -0700

    [PATCH] intelfb section fix
    
    On Nov 16 2004 a change to intelfbdrv.c was commited (as part of 0.9.2 it
    looks like) that added __initdata to all of the module param variables that
    seems to create the opportunity for an oops.
    
    I've recently been chasing an OOPS
    (http://marc.theaimsgroup.com/?l=linux-kernel&m=111552...) I
    created by reading every file on the /sys file system and I've traced it
    back to this code in the intelfbdrv.  Though I had root privs in my initial
    problem report, it turns out they are un-necessary to generate the oops -
    all you've got to do is "cat /sys/module/intelfb/parameters/mode" enough
    times and eventually it will oops.
    
    This is because sysfs automatically exports all module_param declarations
    to the sysfs file system..  which means those variables can be dynamically
    evaluated at any later time, which of course means marking them __initdata
    is a bad idea ;)..  when they happen to be char *'s it is an especially bad
    idea ;).
    
    Applying the patch below clears up the OOPS for me.
    
    Signed-off-by: Patrick McManus <mcmanus@ducksong.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c1e4c8d3ee3300f363a52fd4cf3d90fdf5098f5a
Author: Pavel Machek <pavel@suse.cz>
Date:   Fri May 27 12:53:03 2005 -0700

    [PATCH] fix jumpy mouse cursor on console
    
    Do not send empty events to gpm.  (Keyboards are assumed to have scroll
    wheel these days, that makes them part-mouse.  That means typing on
    keyboard generates empty mouse events).
    
    From: Dmitry Torokhov <dtor_core@ameritech.net>
    Signed-off-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8bd7f125e2f217c8aa3dff005ae291c81246c340
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Fri May 27 12:53:03 2005 -0700

    [PATCH] swsusp: ahd_dv_0 can't be stopped
    
    This driver wants to set PF_NOFREEZE.
    
    Cc: James Bottomley <James.Bottomley@steeleye.com>
    Cc: Pavel Machek <pavel@ucw.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b16eeb47292597a8bf3ad53fdaf1f727f57bd8e4
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Fri May 27 12:53:02 2005 -0700

    [PATCH] ppc32: Fix cpufreq vs. sleep issue
    
    Recent kernels occasionally trigger a PMU timeout on some mac laptops,
    typically on wakeup from sleep.  This seem to be caused by either a too big
    latency caused by the cpufreq switch on wakeup from sleep or by an
    interrupt beeing lost due to the reset of the interrupt controller done
    during wakeup.
    
    This patch makes that code more robust by stopping PMU auto poll activity
    around cpufreq changes on machines that use the PMU for such changes (long
    latency switching involving a CPU hard reset and flush of all caches) and
    by removing the reset of the open pic interrupt controller on wakeup (that
    can cause the loss of an interrupt and Darwin doesn't do it, so it must not
    be necessary).
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 49f384b82b03416dd7e4fc77847a959fe3247362
Author: Siddha, Suresh B <suresh.b.siddha@intel.com>
Date:   Fri May 27 12:53:01 2005 -0700

    [PATCH] x86: fix smp_num_siblings on buggy BIOSes
    
    This fixes 'smp_num_siblings' value on the systems with a buggy bios,
    which sets number of siblings to '2' even when HT is disabled.  (more
    details are at http://bugzilla.kernel.org/show_bug.cgi?id=4359)
    
    I am planning to do more cleanup in this area (like moving smp_num_siblings
    to per cpuinfo) shortly.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b60c1f6ffd88850079ae419aa933ab0eddbd5535
Author: John Hawkes <hawkes@sgi.com>
Date:   Fri May 27 12:53:00 2005 -0700

    [PATCH] drop note_interrupt() for per-CPU for proper scaling
    
    The "unhandled interrupts" catcher, note_interrupt(), increments a global
    desc->irq_count and grossly damages scaling of very large systems, e.g.,
    >192p ia64 Altix, because of this highly contented cacheline, especially
    for timer interrupts.  384p is severely crippled, and 512p is unuseable.
    
    All calls to note_interrupt() can be disabled by booting with "noirqdebug",
    but this disables the useful interrupt checking for all interrupts.
    
    I propose eliminating note_interrupt() for all per-CPU interrupts.  This
    was the behavior of linux-2.6.10 and earlier, but in 2.6.11 a code
    restructuring added a call to note_interrupt() for per-CPU interrupts.
    Besides, note_interrupt() is a bit racy for concurrent CPU calls anyway, as
    the desc->irq_count++ increment isn't atomic (which, if done, would make
    scaling even worse).
    
    Signed-off-by: John Hawkes <hawkes@sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 70ffc71c5c42c8ac62d951e80d9799bd5764f2f5
Author: Adrian Bunk <bunk@stusta.de>
Date:   Fri May 27 12:52:59 2005 -0700

    [PATCH] arch/i386/kernel/cpu/intel_cacheinfo.c: section fix
    
    num_cache_leaves is used in __devexit cache_remove_dev() and can therefore
    not be __devinit.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 9db29258893b08a838e5ecfa4a0933c9c1f2e305
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Fri May 27 12:52:58 2005 -0700

    [PATCH] ppc64 iSeries: make virtual DVD-RAMs writable again
    
    It appears that another test has been added in the Uniform CDROM layer that
    must be passed before a DVD-RAM is considered writeable.  This patch
    implements an emulation of the needed packet command for the viocd driver.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 9ae250d175e1cbff82223ce2c07897c790c5b948
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Fri May 27 12:52:57 2005 -0700

    [PATCH] ppc32: Fix Alsa PowerMac driver on old machines
    
    The g5 support code broke some earlier models unfortunately as those bail
    out early from the detect function, before the point where I added the code
    to locate the PCI device for use with DMA allocations.
    
    This patch fixes it.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d6649bc76a57523209a6b2ee4844c9078a4dd8bb
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Fri May 27 12:52:56 2005 -0700

    [PATCH] ppc32: small cpufreq update
    
    This patch adds a missing attribute to pmac cpufreq so that
    "scaling_available_frequencies" works.  It also cleans up the duplicate
    definitions for low and high speed constants.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: John Clemens <clemej@alum.rpi.edu>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c5924b7d97430657fa07ebf1a208c7e8cf135ef3
Author: Oliver Korpilla <Oliver.Korpilla@gmx.de>
Date:   Fri May 27 12:52:55 2005 -0700

    [PATCH] x86_64: signal.c build fix
    
    For unspecified reasons, arch/x86_64/kernel/signal.c apparently needs
    ia32_unistd.h.
    
    Cc: Andi Kleen <ak@muc.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit dcefb396c2af4d52fba48dc58b4021794b042046
Author: Dave Jones <davej@redhat.com>
Date:   Sat May 28 00:51:24 2005 -0400

    [PATCH] Fix up pwc driver compilation.
    
    The neutering of the pwc driver was incomplete. It still references
    some now-dead files..
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 409b7506759430f7c3841d425ca1f8a31eeadece
Author: Dmitry Torokhov <dtor_core@ameritech.net>
Date:   Sat May 28 02:12:18 2005 -0500

    Input: synaptics - reduce verboseness of synaptics driver - there
           is no reason one driver should take 10 lines in dmesg.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit b4ff99b60c5e17b1031deb20c9d7688ebe6c9659
Author: Dmitry Torokhov <dtor_core@ameritech.net>
Date:   Sat May 28 02:12:10 2005 -0500

    Input: yet another model that does not play nicely when i8042 is
           put in MUX mode - Fujitsu Lifebook S6230
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 59311de3fb5f293b2e99d7f52e0ab5572759951d
Author: Dmitry Torokhov <dtor_core@ameritech.net>
Date:   Sat May 28 02:12:05 2005 -0500

    Input: automatically disable MUX mode on Toshiba Satellite P10
           because it interferes with ALPS touchpad detection and
           causes horrible death on reboot. Since P10 does not have
           external PS/2 ports MUX mode does not have any advantages
           over legacy mode anyway.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit a07461ec0cffb105c7e7b7404520ea2c74129db0
Author: Dmitry Torokhov <dtor_core@ameritech.net>
Date:   Sat May 28 02:12:00 2005 -0500

    Input: gunze - fix out-of-bound array access reported by Adrian Bunk.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit f24949e8e0b9bed223ad9a435bf37e91ee8d0db7
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sat May 28 02:11:49 2005 -0500

    Input: Fix button mapping in joydev - BTN_TRIGGER was being
           mapped twice, resulting in it being the last (instead
           of first) button on a joystick.
    
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 7741e9317137a7456baa9c09ad8308c80c23b8db
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sat May 28 02:11:42 2005 -0500

    Input: Workaround for Sunrex K8561 IR Keyboard/Mouse. The mouse
           sends an incorrect ID and wasn't recognized.
    
    Reported-by: Stefan Seyfried <seife@suse.de>
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 74af42bb729651855f78ea27498250724689130e
Author: Kurt Garloff <garloff@suse.de>
Date:   Sat May 28 02:11:38 2005 -0500

    Input: Avoid double unregistering of i8042 PnP driver. This can happen
           when no i8042 controller (not PnP, not legacy) is present.
    
    From: Kurt Garloff <garloff@suse.de>
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 5a72afc03ccc29458502cf032f5c34e5ee004ae7
Author: Dmitry Torokhov <dtor_core@ameritech.net>
Date:   Sat May 28 02:11:32 2005 -0500

    Input: Tone down the severity of a printk() in i386/ia64 arch code
           for i386, it's printed on many machines and usually is not
           a cause for worry.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

commit 2673c836ab9a44b02d45ae5c1c44c03df138dba4
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sat May 28 02:11:27 2005 -0500

    Input: Only write the CTR in i8042 resume function. Reading it is
           wrong, since it may (will) contain nonsensical data.
    
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit be15692310ec0e93998d763931089cb21386a058
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sat May 28 02:11:19 2005 -0500

    Input: Remove (now) unused variable in i8042.c
    
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff
Author: Vojtech Pavlik <vojtech@suse.cz>
Date:   Sat May 28 02:11:16 2005 -0500

    Input: Add a missing KERN_INFO message designation, fix behavior
           when only a keyboard part of the controller is detected.
    
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 668d1e6093110f7534e661e2ff43d54c74659b6d
Author: Adrian Bunk <bunk@stusta.de>
Date:   Sat May 28 02:11:12 2005 -0500

    Input:
    This patch adds dummy gameport_register_port, gameport_unregister_port
    and gameport_set_phys functions to gameport.h for the case when a driver
    can't use gameport.
    
    This fixes the compilation of some OSS drivers with GAMEPORT=n without
    the need to #if inside every single driver.
    
    This patch also removes the non-working and now obsolete SOUND_GAMEPORT.
    
    This patch is also an alternative solution for ALSA drivers with similar
    problems (but #if's inside the drivers might have the advantage of
    saving some more bytes of gameport is not available).
    
    The only user-visible change is that for GAMEPORT=m the affected OSS
    drivers are now allowed to be built statically (but they won't have
    gameport support).
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 271b74d0b886301f297407dd7ae11b99607f8089
Author: Andrew Morton <akpm@osdl.org>
Date:   Sat May 28 02:11:06 2005 -0500

    Input: Fix a warning in psmouse-base.c
    
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 87507cfdd2cde397c9da8f6e7ec23b2b47ec53d6
Author: domen@coderock.org <domen@coderock.org>
Date:   Fri Apr 8 09:53:06 2005 +0200

    [PATCH] drivers/scsi/ahci: add #include req'd for the DMA_{64,32}BIT_MASK constants
    
    The previous patch did not compile cleanly on all architectures so
    here's a fixed one which #includes <linux/dma-mapping.h>.
    
    Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
    pci_set_dma_mask() or pci_set_consistent_dma_mask()
    This patch includes dma-mapping.h explicitly because it caused errors
    on some architectures otherwise.
    See http://marc.theaimsgroup.com/?t=108001993000001&r=1&... for details
    
    Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    
    diff -puN drivers/scsi/ahci.c~dma_mask-drivers_scsi_ahci drivers/scsi/ahci.c

commit 7003c05d77593f567e9940e68a944d846228fd7a
Author: domen@coderock.org <domen@coderock.org>
Date:   Fri Apr 8 09:53:09 2005 +0200

    [PATCH] drivers/scsi/sata_vsc: add #include req'd for DMA_32BIT_MASK constant
    
    The previous patch did not compile cleanly on all architectures so
    here's a fixed one which #includes <linux/dma-mapping.h>.
    
    Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
    pci_set_dma_mask() or pci_set_consistent_dma_mask()
    This patch includes dma-mapping.h explicitly because it caused errors
    on some architectures otherwise.
    See http://marc.theaimsgroup.com/?t=108001993000001&r=1&... for details
    
    Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    
    diff -puN drivers/scsi/sata_vsc.c~dma_mask-drivers_scsi_sata_vsc drivers/scsi/sata_vsc.c

commit b9a6eaffe7ff3d3481efa9fa353b2c6a02eda756
Author: Daniel Ritz <daniel.ritz@gmx.ch>
Date:   Sun Apr 10 20:27:45 2005 +0200

    [PATCH] 3c574_cs: disable interrupts in el3_close
    
    3c574_cs forgets to disable interrupts during el3_close().
    fix it by doing what 3c59x does.
    
    Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>

commit 254feb882a7c6e4e51416dff6a97d847fbbba551
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Fri May 27 09:26:10 2005 -0700

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

commit 8aadff7dd519800ce7c0e7fb75dcd4438b373134
Author: Alexander Nyberg <alexn@telia.com>
Date:   Fri May 27 12:48:50 2005 +0200

    [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
Author: Len Brown <lenb@toshiba.hsd1.ma.comcast.net>
Date:   Fri May 27 04:53:27 2005 -0400

    [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 9920e91450ee9b373dd4924f79d287a267b8f6a3
Author: Alexander Nyberg <alexn@telia.com>
Date:   Fri May 27 12:27:05 2005 +0200

    [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 25be5e6ccc5c9cab77012fabbb72520f9b6e4618
Author: Len Brown <lenb@toshiba.hsd1.ma.comcast.net>
Date:   Fri May 27 04:21:50 2005 -0400

    [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
Author: Paul Jackson <pj@sgi.com>
Date:   Fri May 27 02:02:43 2005 -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
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Fri May 27 13:40:53 2005 +0100

    [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
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Fri May 27 07:36:17 2005 -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
Author: Christoph Hellwig <hch@hera.kernel.org>
Date:   Fri May 27 01:17:08 2005 -0700

    [XFS] remove an over-zealous WARN_ON

commit b19312c4c8f3f84da57bba01d45549df1cf10dcd
Author: Christoph Hellwig <hch@hera.kernel.org>
Date:   Fri May 27 01:16:24 2005 -0700

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

commit aa8f0dc6c3dbf1cf3ff58f3e945c981be134814d
Author: Jeff Garzik <jgarzik@pobox.com>
Date:   Thu May 26 21:54:27 2005 -0400

    libata: Fix use-after-iounmap
    
    Jens Axboe pointed out that the iounmap() call in libata was occurring
    too early, and some drivers (ahci, probably others) were using ioremap'd
    memory after it had been unmapped.
    
    The patch should address that problem by way of improving the libata
    driver API:
    
    * move ->host_stop() call after all ->port_stop() calls have occurred.
    
    * create default helper function ata_host_stop(), and move iounmap()
    call there.
    
    * add ->host_stop_prewalk() hook, use it in sata_qstor.c (hi Mark).
    sata_qstor appears to require the host-stop-before-port-stop ordering
    that existed prior to applying the attached patch.

commit 462cee296476278acaa54c41925b3273e0e4dd40
Author:  <jgarzik@pretzel.yyz.us>
Date:   Thu May 26 21:40:25 2005 -0400

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

commit d68b8622ccbee8a18e495ad1650c3306f2eeb0d6
Author: Roland McGrath <roland@redhat.com>
Date:   Thu May 26 15:21:13 2005 -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
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Thu May 26 13:54:33 2005 -0700

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

commit b6016b767397258b58163494a869f8f1199e6897
Author: Michael Chan <mchan@broadcom.com>
Date:   Thu May 26 13:03:09 2005 -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
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Thu May 26 12:59:42 2005 -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
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Thu May 26 12:59:05 2005 -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
Author: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Date:   Thu May 26 12:58:04 2005 -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
Author: Jay Vosburgh <fubar@us.ibm.com>
Date:   Thu May 26 12:56:59 2005 -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
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Thu May 26 12:55:48 2005 -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
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Thu May 26 12:55:01 2005 -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
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Thu May 26 12:53:49 2005 -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
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Thu May 26 10:27:39 2005 -0700

    Automatic merge of 'for-linus' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit d11cf326bd5e785cc5a3f5a3d3f4e3a5522f4fb7
Author: Zhang Yanmin <yanmin.zhang@intel.com>
Date:   Sun May 22 17:47:00 2005 -0700

    [IA64] sys_mmap doesn't follow posix.1 when parameter len=0
    
    In IA64 kernel, sys_mmap calls do_mmap2 and do_mmap2 returns addr if
    len=0, which means the mmap sys call succeeds.
    
    Posix.1 says:
    The mmap() function shall fail if:
    [EINVAL] The value of len is zero. 
    
    Here is a patch to fix it.
    
    Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
    Acked-by: David Mosberger <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit cdbbde14cb55dd10771ce79154f787322d88411b
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Thu May 26 10:02:30 2005 -0700

    Merge of 'misc-fixes' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

commit 284e423811495f632a7a334b2b93caba07d4f778
Author: Marcello Maggioni <hayarms@gmail.com>
Date:   Thu May 26 15:47:35 2005 +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).
    

commit 41bb4c43b34bcde7eb62cf19acdcf9f2eb13801d
Author: Stuart Hayes <Stuart_Hayes@dell.com>
Date:   Thu May 26 15:38:45 2005 +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.
    

commit 8604affde9d4f52f04342d6a37c77d95fa167e7a
Author: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Date:   Thu May 26 14:55:34 2005 +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
    

commit 32529e0128923e42126b5d14e444c18295a452ba
Author: Albert Lee <albertcc@tw.ibm.com>
Date:   Thu May 26 03:49:42 2005 -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
Author:  <jgarzik@pretzel.yyz.us>
Date:   Thu May 26 02:17:16 2005 -0400

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

commit ad6a9984eec72f3a609a8685281740f5e5f466aa
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:11:38 2005 -0400

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

commit 38778204a1ad0d2c266f85170c2fb7d80ed43160
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:11:28 2005 -0400

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

commit 8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:11:14 2005 -0400

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

commit 8a75e7d644b373f86c8c2316392cb7374fc4e063
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:11:06 2005 -0400

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

commit f5a702b26a0cd6052f0bae2bc3f0548538d3909c
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:10:53 2005 -0400

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

commit 5ea6f2c33f0c8b126136dbf1776ffbc444772cd7
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:10:38 2005 -0400

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

commit acb969560d5b42500697a8bcd1667ac824928383
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:10:25 2005 -0400

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

commit ee03a68c108cce4af3b4988cb1204e84d81f1243
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:09:52 2005 -0400

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

commit 0c2fc10901e1b516526c92849ccd03327f119dbe
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 22:07:51 2005 -0400

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

commit bef9c558841604116704e10b3d9ff3dbf4939423
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed May 25 18:01:26 2005 -0700

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

commit 3db602bdcd52d8b7523cfb4fb705cea84dbe1617
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed May 25 17:56:57 2005 -0700

    Merge of 'new-ids' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

commit 4c3a53d4108367f639e5e0fe9366dfd7679c5514
Author: Francisco Javier <ffelix@sshinf.com>
Date:   Wed May 25 19:29:37 2005 -0400

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

commit 525a099771d348a25d12ef9c47aa8680c7317e35
Author: NAKAMURA Kenta <kenta@c.csce.kyushu-u.ac.jp>
Date:   Wed May 25 19:28:38 2005 -0400

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

commit d20c507f28dbee33086e8212b98f9ddc5372cd81
Author: Colin Leroy <colin@colino.net>
Date:   Wed May 25 12:31:35 2005 -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
Author: Colin Leroy <colin@colino.net>
Date:   Wed May 25 12:31:34 2005 -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 3bf4fb820d7382318d178bd765c20028415466ab
Author: Roland Dreier <roland@topspin.com>
Date:   Wed May 25 12:31:31 2005 -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 561e148ea972a6e8d2c8f7aecc658b3a64f7a6de
Author: Roland Dreier <roland@topspin.com>
Date:   Wed May 25 12:31:30 2005 -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 e4f50f003dc568f6fc3904d451c562007bd09640
Author: Roland Dreier <roland@topspin.com>
Date:   Wed May 25 12:31:29 2005 -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 4f60fdf613536402e3313c5019b3ae6060b2ae4a
Author: Alexander Nyberg <alexn@telia.com>
Date:   Wed May 25 12:31:28 2005 -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 dca79a046b93a81496bb30ca01177fb17f37ab72
Author: Neil Horman <nhorman@redhat.com>
Date:   Wed May 25 12:31:27 2005 -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
Author: Gerd Knorr <kraxel@suse.de>
Date:   Wed May 25 12:31:26 2005 -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
Author: David S. Miller <davem@sunset.davemloft.net>
Date:   Wed May 25 14:58:04 2005 -0700

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

commit 1b981021e88c8c28dc6a22cb1a327d8dc9296473
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Wed May 25 14:01:50 2005 -0700

    Merge of 'for-linus' branch from
    
    	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit f6f3a488e56783836a0b6ca9188719a1229f505c
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 13:57:36 2005 -0400

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

commit a58eae6480f354595c3954534e1ab591dc3ef1bf
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 13:57:25 2005 -0400

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

commit 09e62666d8a6312426f96bf483cdb003bde556fe
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 13:57:15 2005 -0400

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

commit 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 13:57:03 2005 -0400

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

commit d6d78f63cea62851806bf6ac40c6f53349de442b
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 13:56:55 2005 -0400

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

commit a83d5cf7a1d1dd22f3a8162b728a7e895192dda8
Author:  <jgarzik@pretzel.yyz.us>
Date:   Wed May 25 13:56:22 2005 -0400

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

commit 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5
Author: Jens Axboe <axboe@suse.de>
Date:   Wed May 25 17:00:15 2005 +0200

    [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 0e15850200437c60b969025500e466383ec51ed8
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Wed May 25 09:49:13 2005 +0100

    [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 d0e8e29100c9866878d43bbb40ca17e8fe429851
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Wed May 25 16:29:26 2005 +1000

    [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 8f80e5c911465743ccd3a328f992c7d8aaebf1e8
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Wed May 25 13:41:26 2005 +1000

    [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
Author: David S. Miller <davem@sunset.davemloft.net>
Date:   Tue May 24 18:08:07 2005 -0700

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

commit 9092f46b5aed4515d9a427d5dab3be1584851f07
Author: John W. Linville <linville@tuxdriver.com>
Date:   Wed May 18 13:41:33 2005 -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
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 23 15:52:08 2005 -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 7e2987503dda95a5f80290bb8c06279009c2419e
Author: Steve French <sfrench@hera.kernel.org>
Date:   Thu May 19 12:26:57 2005 -0700

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

commit fe12e25ebdd195a57d3fd655061fd2525609b16b
Author: Tony Luck <tony.luck@intel.com>
Date:   Wed May 18 17:09:06 2005 -0700

    [IA64] initialize spinlock pfm_alt_install_check
    
    I applied the penultimate version of the perfmon patch, which didn't have
    the initialization of the new spinlock that was added.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 3d620cd75588a37c7f5547e26e2a28b046c280f0
Author: Tony Luck <tony.luck@intel.com>
Date:   Wed May 18 16:28:52 2005 -0700

    Sync with Linus - rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

commit a1ecf7f6e65637ba4470405ad39794710dbf85d4
Author: Tony Luck <tony.luck@intel.com>
Date:   Wed May 18 16:06:00 2005 -0700

    [IA64] alternate perfmon handler
    
    Patch from Charles Spirakis
    
    Some linux customers want to optimize their applications on the latest
    hardware but are not yet willing to upgrade to the latest kernel. This
    patch provides a way to plug in an alternate, basic, and GPL'ed PMU
    subsystem to help with their monitoring needs or for specialty work. It
    can also be used in case of serious unexpected bugs in perfmon. Mutual
    exclusion between the two subsystems is guaranteed, hence no conflict
    can arise from both subsystem being present.
    
    Acked-by: Stephane Eranian <eranian@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit b1a45695bde0204597957e448923f09ce271ca80
Author: Steve French <stevef@stevef95>
Date:   Tue May 17 16:07:23 2005 -0500

    [CIFS] fix casts of unicode strings to match function definition
    
    Signed-off-by: Steve French (sfrench@us.ibm.com)

commit 6872ec548970e9fb3ccd61013f84f9bb8b30fa9a
Author: Russ Anderson <(rja@sgi.com)>
Date:   Mon May 16 15:30:00 2005 -0700

    [IS64-SGI] Set Altix error handling features
    
    The 2.6 kernel has CPE error thresholding.
    This patch lets SAL know of this error handling feature.
    The changes are SN specific.
    
    Signed-off-by: Russ Anderson (rja@sgi.com)
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 8eac3757158ccd9c6b43f44f228a5762fec33781
Author: Russ Anderson <(rja@sgi.com)>
Date:   Mon May 16 15:19:00 2005 -0700

    [IA64-SGI] Make Altix SAL call to POD reentrant
    
    Change the SAL call for POD mode to be reentrant.
    This change is SN specific.
    
    Signed-off-by: Russ Anderson (rja@sgi.com)
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit bb68c12b40c3c745381d7ce61d7b2e371f157505
Author: Russ Anderson <(rja@sgi.com)>
Date:   Mon May 9 15:03:00 2005 -0700

    [IA64-SGI] cpe interrupts are not being enabled.
    
    acpi_request_vector() is called in ia64_mca_init() to get the cpe_vector.
    The problem is that acpi_request_vector() looks in platform_intr_list[] to 
    get the vector, but platform_intr_list[] is not initialized with a valid
    vector until later (in sn_setup()).  Without a valid vector the code
    defaults to polling mode.
    
    This patch moves the call to acpi_request_vector() from ia64_mca_init()
    to ia64_mca_late_init(), which is after platform_intr_list[] is initialized.
    
    Signed-off-by: Russ Anderson (rja@sgi.com)
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 056b5033fb8d16095fb074fc910fad90186374f3
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Mon May 9 14:52:00 2005 -0700

    [PATCH] update sn2 maintainer
    
    Now that I'm no longer at SGI and don't have access to Altix equipment, 
    it's time to pass on the job of patch monkey to someone else.  Greg 
    Edwards has foolishly^Wkindly volunteered for the job, so here's a 
    patch to update the MAINTAINERS file with the appropriate information.
    
    Signed-off-by: Jesse Barnes <jesse.barnes@intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 02a017a9f37ae6842e065da919b5952eb847e869
Author: David Mosberger-Tang <davidm@hpl.hp.com>
Date:   Tue May 10 11:35:00 2005 -0700

    [IA64] Correct convert_to_non_syscall()
    
    convert_to_non_syscall() has the same problem that unwind_to_user()
    used to have.  Fix it likewise.
    
    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit b2aeb9d565be5ef00fb9f921c6d2459c74d90cdf
Author: Steve French <stevef@stevef95>
Date:   Tue May 17 13:16:18 2005 -0500

    [CIFS] Fix oops in cifs_unlink.  Caused in some cases when renaming over existing,
    newly created, file.
    
    Samba bugzilla: 2697
    
    Signed-off-by: Steve French (sfrench@us.ibm.com)
    

commit 67594feb4b68074d8807f5566536e06db9130679
Author: Steve French <stevef@stevef95>
Date:   Tue May 17 13:04:49 2005 -0500

    [CIFS] missing break needed to handle < when mount option "mapchars" specified
    
    Signed-off-by: Steve French (sfrench@us.ibm.com)

commit d0dac8082cbc2b234917ec53eb591b1ddbec80bb
Author: Tony Luck <tony.luck@intel.com>
Date:   Tue May 17 09:10:20 2005 -0700

    Merge with linus
    

commit 562faf469f35bf63c0b021550811280c81bdc52e
Author: James Harper <james.harper@bendigoit.com.au>
Date:   Thu May 5 15:14:18 2005 -0700

    [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
Author: Benjamin LaHaise <bcrl@kvack.org>
Date:   Wed Apr 6 11:17:59 2005 -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
Author: Stephen Hemminger <shemminger@osdl.org>
Date:   Wed May 4 15:33:11 2005 -0700

    [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
Author: Adrian Bunk <bunk@stusta.de>
Date:   Sat Apr 30 13:52:49 2005 +0200

    [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
Author: Don Fry <brazilnut@us.ibm.com>
Date:   Fri Apr 29 14:51:17 2005 -0700

    [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
Author: Dan Williams <dcbw@redhat.com>
Date:   Tue May 10 09:45:51 2005 -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
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Sat Apr 16 16:24:16 2005 +1000

    [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
Author: simon@thekelleys.org.uk <simon@thekelleys.org.uk>
Date:   Sat May 7 21:33:31 2005 +0100

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

commit 22c6d143f33f10721216a8cfa3a83f7edfc2bd4e
Author: Manfred Spraul <manfred@colorfullife.com>
Date:   Tue Apr 19 21:17:09 2005 +0200

    [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
Author: Michael Ellerman <michael@ellerman.id.au>
Date:   Thu May 12 18:09:45 2005 +1000

    [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 41664c03f6c96a1f8a91714309b36f1b5ca85610
Author: Michael Ellerman <michael@ellerman.id.au>
Date:   Thu May 12 17:55:08 2005 +1000

    [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 eb235aef724568ae15af831968000cf9a3974b26
Author: Michael Ellerman <michael@ellerman.id.au>
Date:   Thu May 12 17:53:18 2005 +1000

    [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 f27eff1ffd65236b8e421188f76ad1b0b94e06eb
Author: Michael Ellerman <michael@ellerman.id.au>
Date:   Thu May 12 17:47:27 2005 +1000

    [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 05e08a2a297371564020f76d1bf8b3a931d5e1ed
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:39:09 2005 +0200

    [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 9a4558193662e933588ee53e0202c103a68c9366
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:38:28 2005 +0200

    [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 e23dd9cdd676323c95fab47dc55123ba18f7e1ff
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:38:11 2005 +0200

    [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
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:37:53 2005 +0200

    [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 5e39f2933f6707fc824b5e419dcac8ced67a57b6
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:37:00 2005 +0200

    [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 7394c928c849fe2ea5c20b6d73cbe7f220810d94
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:36:47 2005 +0200

    [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 7f81947b46c3efacc084ac5033f3fed702e46532
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:36:22 2005 +0200

    [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 b5f9d55b64a5c7193f8965c90ba62244ea3180b2
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:35:57 2005 +0200

    [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 109a260b66bfbab7ba9f985495791af21f910218
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:19:44 2005 +0200

    [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 321de3c8cc12bdff073c23524aa1f6ed47cbeee4
Author: Frank Pavlic <pavlic@de.ibm.com>
Date:   Thu May 12 20:17:46 2005 +0200

    [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 042e2fb70006f135469d546726451b7d14768980
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:20:14 2005 -0700

    [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 962082b6df11fe8cabafd2971b07c914cd52ee2a
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:19:46 2005 -0700

    [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
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:17:54 2005 -0700

    [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 0236ebb7ae85935b3b96eef7e8a4e203ea9958a0
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:17:42 2005 -0700

    [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 1f53367d5d75ba37f258f6e955d6fc24814051a0
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:17:20 2005 -0700

    [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 2acdb1e05c1a92e05ee710ed8f226a8f3183d5a0
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:16:58 2005 -0700

    [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 ac79c82e793bc2440c4765e5eb1b834d2c18edf2
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:05:32 2005 -0700

    [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 37d16f823799918107440cb9e552b0709347f77c
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:05:12 2005 -0700

    [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 f404de1cd407c1f56fa478810c6c48e015d377bd
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:04:54 2005 -0700

    [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
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:04:32 2005 -0700

    [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 5e3c30deb21d0eb0da44830fb1c1fc7054e54229
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:04:07 2005 -0700

    [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 abf481d6af8670c89f33f354c6fbd9977b23cebc
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:03:32 2005 -0700

    [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 41639fed1b32dde4ea3d94242a89308435d341be
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 18:51:54 2005 -0700

    [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 6dfbb6dd391139be9f1cd333877c6e2b03da4bba
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 18:56:40 2005 -0700

    [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 0c73f58636385a4d3dc68d0d0829d4c39d61b621
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 18:48:06 2005 -0700

    [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
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 18:46:51 2005 -0700

    [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 5633684d008b777ab169e8efcef39a898482f531
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 18:45:50 2005 -0700

    [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 2648345fcbadfae8e7113112ff9402e465a184dc
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:44:46 2005 -0700

    [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
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:44:25 2005 -0700

    [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 0e6ef3e02b6f07e37ba1c1abc059f8bee4e0847f
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:44:14 2005 -0700

    [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 2d7edb923a823660b081bd4c660300ee19adca8d
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:43:52 2005 -0700

    [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 f0d11ed0b0650d2f93f56f65167c10a577c16c88
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:43:28 2005 -0700

    [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 f1d2e4905eed4b13c3ba56ac6d30c283be996963
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:42:04 2005 -0700

    [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 97338bde27d97347bc83203d6ac5e93be1ebcd03
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:41:46 2005 -0700

    [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 a4cb847dac40577dd751a4deb4085ed080780679
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:41:28 2005 -0700

    [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 6d9157577d926d2a83fe8d4914c0cc216deb5842
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:41:11 2005 -0700

    [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 70b8f1e16a788eccdd36f39679774b1a08a6ba55
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:40:40 2005 -0700

    [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 2701234fc0372630457e3da14e36cde53c57d12e
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:40:28 2005 -0700

    [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 4e48a2b91d408357cb0747151d8db5368ac8f1d0
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:39:53 2005 -0700

    [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 5de556249fde97493a4c79dbf8979ace0f76789f
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:39:30 2005 -0700

    [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 fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:39:13 2005 -0700

    [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 df25e164878836196ee93d1a5757867da6eac30e
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:38:43 2005 -0700

    [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 e4eff7291c977308989b24fdfc7215a501302e6a
Author: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date:   Thu Apr 28 19:38:30 2005 -0700

    [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 da369b01d49b34803265096eb92a2d6da61cf0d0
Author: Daniele Venzano <webvenza@libero.it>
Date:   Thu May 12 20:13:14 2005 -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 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c
Author: Francois Romieu <romieu@fr.zoreil.com>
Date:   Thu May 12 20:09:17 2005 -0400

      [PATCH] r8169: incoming frame length check
      
      The size of the incoming frame is not correctly checked.
      
      The RxMaxSize register (0xDA) does not work as expected and incoming
      frames whose size exceeds the MTU actually end spanning multiple
      descriptors. The first Rx descriptor contains the size of the whole
      frame (or some garbage in its place). The driver does not expect
      something above the space allocated to the current skb and crashes
      loudly when it issues a skb_put.
      
      The fix contains two parts:
      - disable hardware Rx size filtering: so far it only proved to be able
        to trigger some new fancy errors;
      - drop multi-descriptors frame: as the driver allocates MTU sized Rx
        buffers, it provides an adequate filtering.
      
      As a bonus, wrong descriptors were not returned to the asic after their
      processing.
      
      Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 2918c35d311263bc313b3da272783860ce573189
Author: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Date:   Thu May 12 19:42:06 2005 -0400

    [PATCH] forcedeth: netpoll support

commit dfa1b73ffb414b64dc0452260132a090eb25bf52
Author: Liu Tao <liutao1980@gmail.com>
Date:   Thu May 12 19:40:38 2005 -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 bfd68594082d8384781c242aa72a7950b5cf51aa
Author: David Mosberger-Tang <davidm@hpl.hp.com>
Date:   Wed May 4 06:42:00 2005 -0700

    [IA64] Avoid .spillpsp directive in handcoded assembly
    
    Some time ago, GAS was fixed to bring the .spillpsp directive in line
    with the Intel assembler manual (there was some disagreement as to
    whether or not there is a built-in 16-byte offset).  Unfortunately,
    there are two places in the kernel where this directive is used in
    handwritten assembly files and those of course relied on the "buggy"
    behavior.  As a result, when using a "fixed" assembler, the kernel
    picks up the UNaT bits from the wrong place (off by 16) and randomly
    sets NaT bits on the scratch registers.  This can be noticed easily by
    looking at a coredump and finding various scratch registers with
    unexpected NaT values.  The patch below fixes this by using the
    .spillsp directive instead, which works correctly no matter what
    assembler is in use.
    
    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit a84f5770170232a48e753e02ee5f0f17ee17b791
Author: Tony Luck <tony.luck@intel.com>
Date:   Mon May 9 16:44:53 2005 -0700

    Merge with /home/aegl/GIT/linus
    

commit 66302f211a21bb9439a2ae7f7b6a4c386bb10ecd
Author: David Mosberger-Tang <davidm@hpl.hp.com>
Date:   Tue Apr 12 11:04:00 2005 -0700

    [IA64] fix "section mismatch" compile-time-error
    
    I noticed this typo when trying to compile a kernel which had
    CONFIG_HOTPLUG turned off.  In that case, __devinit is no longer a
    no-op and the compiler then detects a section-conflict.  Fix by using
    __devinitdata instead of __devinit.
    
    Same patch also submitted by Darren Williams to fix compilation error
    using sim_defconfig (which has CONFIG_HOTPLUG=n).
    
    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by:  Darren Williams <dsw@gelato.unsw.edu.au>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 966dc11fcc48866a24d9b3fd16eeebb3f5e05931
Author: David Mosberger-Tang <davidm@hpl.hp.com>
Date:   Fri May 6 05:25:00 2005 -0700

    [IA64] Fix stack placement when INIT hits in kernel mode.
    
    Without this patch, the stack is placed _below_ the current task
    structure, which is risky at best.
    
    Tony, I think this patch needs to go into 2.6.12, since it fixes a
    real bug.  Without it, INIT may case secondary errors, which would be
    most unpleasant.
    
    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit d3870398fafd4911bd84573b78be4b6b762f32b0
Author: Nathan Scott <nathans@sgi.com>
Date:   Fri May 6 06:44:46 2005 -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
Author: Russell Cattelan <cattelan@sgi.com>
Date:   Fri May 6 06:42:22 2005 -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>



(Log in to post comments)

Copyright © 2005, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds