commit 8f40f672e6bb071812f61bfbd30efc3fc1263ad1
Merge: 8978a31... 887b3ec...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 19:30:13 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
    
    * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: fix error path during early mount
      9p: make cryptic unknown error from server less scary
      9p: fix flags length in net
      9p: Correct fidpool creation failure in p9_client_create
      9p: use struct mutex instead of struct semaphore
      9p: propagate parse_option changes to client and transports
      fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure.
      9p: Documentation updates
      add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust

commit 8978a318837d7acefca82645017c0534aeba5a36
Merge: f7fd63c... 9a28dbf...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 19:11:36 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Use a TS_RESTORE_SIGMASK
      lmb: Make lmb debugging more useful.
      lmb: Fix inconsistent alignment of size argument.
      sparc: Fix mremap address range validation.

commit f7fd63c0b5e170efc20e7b9a0aad7f69dff62c64
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed May 14 16:05:59 2008 -0700

    net/irda/irnet/irnet_irda.c needs unaligned.h
    
    net/irda/irnet/irnet_irda.c: In function 'irnet_discovery_indication':
    net/irda/irnet/irnet_irda.c:1676: error: implicit declaration of function 'get_unaligned'
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9ffee4cbc51907755809d98613d9e7133612803a
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed May 14 16:05:58 2008 -0700

    tty_check_change(): avoid taking tasklist_lock while holding tty->ctrl_lock
    
    May 11 09:42:27 [kernel] [ 1104.496819] rarian-sk-get-c[5630]: segfault at 0 ip 7f478556caf0 sp 7fff8e3fe338 error 4 in libc-2.6.1.so[7f47854f9000+136000]
    May 11 10:59:48 [kernel] [ 2494.165792]
    May 11 10:59:48 [kernel] [ 2494.165794] =======================================================
    May 11 10:59:48 [kernel] [ 2494.165801] [ INFO: possible circular locking dependency detected ]
    May 11 10:59:48 [kernel] [ 2494.165805] 2.6.26-rc1-00007-g91b3a7a #217
    May 11 10:59:48 [kernel] [ 2494.165807] -------------------------------------------------------
    May 11 10:59:48 [kernel] [ 2494.165809] less/7053 is trying to acquire lock:
    May 11 10:59:48 [kernel] [ 2494.165812]  (tasklist_lock){..??}, at: [<ffffffff80232e95>] is_current_pgrp_orphaned+0x15/0x50
    May 11 10:59:48 [kernel] [ 2494.165821]
    May 11 10:59:48 [kernel] [ 2494.165822] but task is already holding lock:
    May 11 10:59:48 [kernel] [ 2494.165824]  (&tty->ctrl_lock){....}, at: [<ffffffff803d5f31>] tty_check_change+0x61/0x110
    May 11 10:59:48 [kernel] [ 2494.165831]
    May 11 10:59:48 [kernel] [ 2494.165832] which lock already depends on the new lock.
    May 11 10:59:48 [kernel] [ 2494.165833]
    May 11 10:59:48 [kernel] [ 2494.165835]
    May 11 10:59:48 [kernel] [ 2494.165836] the existing dependency chain (in reverse order) is:
    May 11 10:59:48 [kernel] [ 2494.165838]
    May 11 10:59:48 [kernel] [ 2494.165839] -> #2 (&tty->ctrl_lock){....}:
    May 11 10:59:48 [kernel] [ 2494.165843]        [<ffffffff80253796>] __lock_acquire+0xf86/0x1080
    May 11 10:59:48 [kernel] [ 2494.165851]        [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.165858]        [<ffffffff804deee0>] _spin_lock_irqsave+0x40/0x60
    May 11 10:59:48 [kernel] [ 2494.165866]        [<ffffffff803d31b5>] __proc_set_tty+0x35/0xe0
    May 11 10:59:48 [kernel] [ 2494.165873]        [<ffffffff803d76d4>] tty_ioctl+0xbf4/0xfe0
    May 11 10:59:48 [kernel] [ 2494.165880]        [<ffffffff802a05e1>] vfs_ioctl+0x31/0x90
    May 11 10:59:48 [kernel] [ 2494.165888]        [<ffffffff802a06b3>] do_vfs_ioctl+0x73/0x2d0
    May 11 10:59:48 [kernel] [ 2494.165895]        [<ffffffff802a095a>] sys_ioctl+0x4a/0x80
    May 11 10:59:48 [kernel] [ 2494.165902]        [<ffffffff8020b5ab>] system_call_after_swapgs+0x7b/0x80
    May 11 10:59:48 [kernel] [ 2494.165910]        [<ffffffffffffffff>] 0xffffffffffffffff
    May 11 10:59:48 [kernel] [ 2494.165924]
    May 11 10:59:48 [kernel] [ 2494.165925] -> #1 (&sighand->siglock){++..}:
    May 11 10:59:48 [kernel] [ 2494.165929]        [<ffffffff80253796>] __lock_acquire+0xf86/0x1080
    May 11 10:59:48 [kernel] [ 2494.165936]        [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.165943]        [<ffffffff804dec1f>] _spin_lock+0x2f/0x40
    May 11 10:59:48 [kernel] [ 2494.165951]        [<ffffffff8022d5a3>] copy_process+0x973/0x1210
    May 11 10:59:48 [kernel] [ 2494.165959]        [<ffffffff8022df12>] do_fork+0x82/0x2f0
    May 11 10:59:48 [kernel] [ 2494.165967]        [<ffffffff8020bfe1>] kernel_thread+0x81/0xde
    May 11 10:59:48 [kernel] [ 2494.165974]        [<ffffffff8020c048>] child_rip+0xa/0x12
    May 11 10:59:48 [kernel] [ 2494.165981]        [<ffffffffffffffff>] 0xffffffffffffffff
    May 11 10:59:48 [kernel] [ 2494.166038]
    May 11 10:59:48 [kernel] [ 2494.166039] -> #0 (tasklist_lock){..??}:
    May 11 10:59:48 [kernel] [ 2494.166043]        [<ffffffff802535ab>] __lock_acquire+0xd9b/0x1080
    May 11 10:59:48 [kernel] [ 2494.166050]        [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.166057]        [<ffffffff804dede2>] _read_lock+0x32/0x50
    May 11 10:59:48 [kernel] [ 2494.166063]        [<ffffffff80232e95>] is_current_pgrp_orphaned+0x15/0x50
    May 11 10:59:48 [kernel] [ 2494.166071]        [<ffffffff803d5f80>] tty_check_change+0xb0/0x110
    May 11 10:59:48 [kernel] [ 2494.166078]        [<ffffffff803dac5f>] set_termios+0x1f/0x4c0
    May 11 10:59:48 [kernel] [ 2494.166085]        [<ffffffff803db379>] tty_mode_ioctl+0x279/0x3e0
    May 11 10:59:48 [kernel] [ 2494.166092]        [<ffffffff803db51d>] n_tty_ioctl+0x3d/0x260
    May 11 10:59:48 [kernel] [ 2494.166100]        [<ffffffff803d6c34>] tty_ioctl+0x154/0xfe0
    May 11 10:59:48 [kernel] [ 2494.166107]        [<ffffffff802a05e1>] vfs_ioctl+0x31/0x90
    May 11 10:59:48 [kernel] [ 2494.166114]        [<ffffffff802a06b3>] do_vfs_ioctl+0x73/0x2d0
    May 11 10:59:48 [kernel] [ 2494.166121]        [<ffffffff802a095a>] sys_ioctl+0x4a/0x80
    May 11 10:59:48 [kernel] [ 2494.166128]        [<ffffffff8020b5ab>] system_call_after_swapgs+0x7b/0x80
    May 11 10:59:48 [kernel] [ 2494.166135]        [<ffffffffffffffff>] 0xffffffffffffffff
    May 11 10:59:48 [kernel] [ 2494.166142]
    May 11 10:59:48 [kernel] [ 2494.166143] other info that might help us debug this:
    May 11 10:59:48 [kernel] [ 2494.166144]
    May 11 10:59:48 [kernel] [ 2494.166146] 1 lock held by less/7053:
    May 11 10:59:48 [kernel] [ 2494.166148]  #0:  (&tty->ctrl_lock){....}, at: [<ffffffff803d5f31>] tty_check_change+0x61/0x110
    May 11 10:59:48 [kernel] [ 2494.166155]
    May 11 10:59:48 [kernel] [ 2494.166156] stack backtrace:
    May 11 10:59:48 [kernel] [ 2494.166159] Pid: 7053, comm: less Not tainted 2.6.26-rc1-00007-g91b3a7a #217
    May 11 10:59:48 [kernel] [ 2494.166161]
    May 11 10:59:48 [kernel] [ 2494.166162] Call Trace:
    May 11 10:59:48 [kernel] [ 2494.166168]  [<ffffffff80251223>] print_circular_bug_tail+0x83/0x90
    May 11 10:59:48 [kernel] [ 2494.166172]  [<ffffffff80250889>] ? print_circular_bug_entry+0x49/0x60
    May 11 10:59:48 [kernel] [ 2494.166178]  [<ffffffff802535ab>] __lock_acquire+0xd9b/0x1080
    May 11 10:59:48 [kernel] [ 2494.166184]  [<ffffffff80232e95>] ? is_current_pgrp_orphaned+0x15/0x50
    May 11 10:59:48 [kernel] [ 2494.166189]  [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.166206]  [<ffffffff803d5f80>] tty_check_change+0xb0/0x110
    May 11 10:59:48 [kernel] [ 2494.166211]  [<ffffffff803dac5f>] set_termios+0x1f/0x4c0
    May 11 10:59:48 [kernel] [ 2494.166216]  [<ffffffff803d3423>] ? tty_ldisc_try+0x23/0x60
    May 11 10:59:48 [kernel] [ 2494.166220]  [<ffffffff803d3444>] ? tty_ldisc_try+0x44/0x60
    May 11 10:59:48 [kernel] [ 2494.166224]  [<ffffffff804df2c5>] ? _spin_unlock_irqrestore+0x65/0x80
    May 11 10:59:48 [kernel] [ 2494.166230]  [<ffffffff803db379>] tty_mode_ioctl+0x279/0x3e0
    May 11 10:59:48 [kernel] [ 2494.166234]  [<ffffffff803d3444>] ? tty_ldisc_try+0x44/0x60
    May 11 10:59:48 [kernel] [ 2494.166239]  [<ffffffff803db51d>] n_tty_ioctl+0x3d/0x260
    May 11 10:59:48 [kernel] [ 2494.166244]  [<ffffffff803d6c34>] tty_ioctl+0x154/0xfe0
    May 11 10:59:48 [kernel] [ 2494.166249]  [<ffffffff80252baa>] ? __lock_acquire+0x39a/0x1080
    May 11 10:59:48 [kernel] [ 2494.166256]  [<ffffffff80252baa>] ? __lock_acquire+0x39a/0x1080
    May 11 10:59:48 [kernel] [ 2494.166263]  [<ffffffff80252baa>] ? __lock_acquire+0x39a/0x1080
    May 11 10:59:48 [kernel] [ 2494.166269]  [<ffffffff802a05e1>] vfs_ioctl+0x31/0x90
    May 11 10:59:48 [kernel] [ 2494.166274]  [<ffffffff802a06b3>] do_vfs_ioctl+0x73/0x2d0
    May 11 10:59:48 [kernel] [ 2494.166280]  [<ffffffff802a095a>] sys_ioctl+0x4a/0x80
    May 11 10:59:48 [kernel] [ 2494.166286]  [<ffffffff8020b5ab>] system_call_after_swapgs+0x7b/0x80
    May 11 10:59:48 [kernel] [ 2494.166292]
    
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e7e72bf641b1fc7b9df6f40bd2c36dfccd8d647c
Author: Neil Brown <neilb@suse.de>
Date:   Wed May 14 16:05:54 2008 -0700

    Remove blkdev warning triggered by using md
    
    As setting and clearing queue flags now requires that we hold a spinlock
    on the queue, and as blk_queue_stack_limits is called without that lock,
    get the lock inside blk_queue_stack_limits.
    
    For blk_queue_stack_limits to be able to find the right lock, each md
    personality needs to set q->queue_lock to point to the appropriate lock.
    Those personalities which didn't previously use a spin_lock, us
    q->__queue_lock.  So always initialise that lock when allocated.
    
    With this in place, setting/clearing of the QUEUE_FLAG_PLUGGED bit will no
    longer cause warnings as it will be clear that the proper lock is held.
    
    Thanks to Dan Williams for review and fixing the silly bugs.
    
    Signed-off-by: NeilBrown <neilb@suse.de>
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Cc: Alistair John Strachan <alistair@devzero.co.uk>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Cc: Jacek Luczak <difrost.kernel@gmail.com>
    Cc: Prakash Punnoor <prakash@punnoor.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4920916f728fe3c51f54c25ab7b3d271254aab5a
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Wed May 14 16:05:53 2008 -0700

    char: select fw_loader by moxa
    
    Select FW_LOADER since moxa needs it, otherwise we face link problems such
    as:
    
    drivers/built-in.o: In function
    moxa_pci_probe':moxa.c:(.devinit.text+0x76d8): undefined reference to
    request_firmware'
    :moxa.c:(.devinit.text+0x7e6e): undefined reference to release_firmware'
    make: *** [.tmp_vmlinux1] Error 1
    
    Reported-by: Philippe Roussel <p.o.roussel@free.fr>
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 76cdd58e558669366adfaded436fda01b30cce3e
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Wed May 14 16:05:52 2008 -0700

    memory_hotplug: always initialize pageblock bitmap
    
    Trying to online a new memory section that was added via memory hotplug
    sometimes results in crashes when the new pages are added via __free_page.
     Reason for that is that the pageblock bitmap isn't initialized and hence
    contains random stuff.  That means that get_pageblock_migratetype()
    returns also random stuff and therefore
    
    	list_add(&page->lru,
    		&zone->free_area[order].free_list[migratetype]);
    
    in __free_one_page() tries to do a list_add to something that isn't even
    necessarily a list.
    
    This happens since 86051ca5eaf5e560113ec7673462804c54284456 ("mm: fix
    usemap initialization") which makes sure that the pageblock bitmap gets
    only initialized for pages present in a zone.  Unfortunately for hot-added
    memory the zones "grow" after the memmap and the pageblock memmap have
    been initialized.  Which means that the new pages have an unitialized
    bitmap.  To solve this the calls to grow_zone_span() and grow_pgdat_span()
    are moved to __add_zone() just before the initialization happens.
    
    The patch also moves the two functions since __add_zone() is the only
    caller and I didn't want to add a forward declaration.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Andy Whitcroft <apw@shadowen.org>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1c12c4cf9411eb130b245fa8d0fbbaf989477c7b
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed May 14 16:05:51 2008 -0700

    mprotect: prevent alteration of the PAT bits
    
    There is a defect in mprotect, which lets the user change the page cache
    type bits by-passing the kernel reserve_memtype and free_memtype
    wrappers.  Fix the problem by not letting mprotect change the PAT bits.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 44c81433e8b05dbc85985d939046f10f95901184
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Wed May 14 16:05:51 2008 -0700

    per_cpu: fix DEFINE_PER_CPU_SHARED_ALIGNED for modules
    
    Current module loader lookups ".data.percpu" ELF section to perform
    per_cpu relocation.  But DEFINE_PER_CPU_SHARED_ALIGNED() uses another
    section (".data.percpu.shared_aligned"), currently only handled in
    vmlinux.lds, not by module loader.
    
    To correct this problem, instead of adding logic into module loader, or
    using at build time a module.lds file for all arches to group
    ".data.percpu.shared_aligned" into ".data.percpu", just use ".data.percpu"
    for modules.
    
    Alignment requirements are correctly handled by ld and module loader.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit fd8a4221ad76df700ff34875c9fbc42302aa4ba3
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date:   Wed May 14 16:05:50 2008 -0700

    memory_hotplug: check for walk_memory_resource() failure in online_pages()
    
    Add a check to online_pages() to test for failure of
    walk_memory_resource().  This fixes a condition where a failure
    of walk_memory_resource() can lead to online_pages() returning
    success without the requested pages being onlined.
    
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Keith Mannthey <kmannth@us.ibm.com>
    Cc: Christoph Lameter <clameter@sgi.com>
    Cc: Paul Jackson <pj@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3fc957721d18c93662f7d4dab455b80f53dd2641
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed May 14 16:05:49 2008 -0700

    lib: create common ascii hex array
    
    Add a common hex array in hexdump.c so everyone can use it.
    
    Add a common hi/lo helper to avoid the shifting masking that is
    done to get the upper and lower nibbles of a byte value.
    
    Pull the pack_hex_byte helper from kgdb as it is opencoded many
    places in the tree that will be consolidated.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Cc: Jason Wessel <jason.wessel@windriver.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 122a881c776b7c155bf3f379928cc27aab435288
Author: Robin Getz <robin.getz@analog.com>
Date:   Wed May 14 16:05:48 2008 -0700

    video/logo: add support for Blackfin/Linux logo for framebuffer console
    
    This art design is beautiful, isn't it?  And you can watch our demo on
    YouTube: http://youtube.com/watch?v=fKyQOntPEFs
    
    Signed-off-by: Robin Getz <robin.getz@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7e01c8e5420b6c7f9d85d34c15d8c7a15c9fc720
Author: Tiger Yang <tiger.yang@oracle.com>
Date:   Wed May 14 16:05:47 2008 -0700

    ext3/4: fix uninitialized bs in ext3/4_xattr_set_handle()
    
    This fix the uninitialized bs when we try to replace a xattr entry in
    ibody with the new value which require more than free space.
    
    This situation only happens we format ext3/4 with inode size more than 128 and
    we have put xattr entries both in ibody and block.  The consequences about
    this bug is we will lost the xattr block which pointed by i_file_acl with all
    xattr entires in it.  We will alloc a new xattr block and put that large value
    entry in it.  The old xattr block will become orphan block.
    
    Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
    Cc: <linux-ext4@vger.kernel.org>
    Cc: Andreas Gruenbacher <agruen@suse.de>
    Acked-by: Andreas Dilger <adilger@sun.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0c70814c311581a6c86198db4f982aa683c68fb8
Author: Mirco Tischler <mt-ml@gmx.de>
Date:   Wed May 14 16:05:46 2008 -0700

    cgroups: fix compile warning
    
    Return type of cpu_rt_runtime_write() should be int instead of ssize_t.
    
    Signed-off-by: Mirco Tischler <mt-ml@gmx.de>
    Acked-by: Paul Menage <menage@google.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b7cffc1f29c1bc729bc50c863c87f93f9b70994b
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed May 14 16:05:42 2008 -0700

    asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace
    
    I noticed this because alpha was broken due to the recent commit commit
    bdc807871d58285737d50dc6163d0feb72cb0dc2 ("avoid overflows in
    kernel/time.c").  Most arches do something like this in their
    asm/param.h:
    
    #ifdef __KERNEL__
    # define HZ CONFIG_HZ
    #else
    # define HZ 100
    #endif
    
    A few arches though (namely alpha/h8300/um/v850/xtensa) either do no set
    HZ at all for !__KERNEL__, or they set it wrongly.  This should bring all
    arches in line by setting up HZ for userspace.
    
    Without this currently perl 5.10 doesn't build on alpha:
    
    perl.c: In function 'perl_construct':
    perl.c:388: error: 'CONFIG_HZ' undeclared (first use in this function)
    -> http://buildd.debian.org/fetch.cgi?pkg=perl;ver=5.10.0-10;arch=alpha;stamp=1210252894
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Cc: Jeff Dike <jdike@addtoit.com>
    Cc: Chris Zankel <chris@zankel.net>
    Cc: maximilian attems <max@stro.at>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    [ HZ on alpha is 1024 for historical reasons.  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 772279c5f1dceb58d451dca94b557fd89b1ce890
Author: Mingming Cao <cmm@us.ibm.com>
Date:   Wed May 14 16:05:41 2008 -0700

    jbd: need to hold j_state_lock to updates to transaction t_state to T_COMMIT
    
    Updating the current transaction's t_state is protected by j_state_lock.  We
    need to do the same when updating the t_state to T_COMMIT.
    
    Signed-off-by: Mingming Cao <cmm@us.ibm.com>
    Acked-by: Jan Kara <jack@ucw.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c3723ca3874a8fc2218c4726d57e3a7da9e83e47
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Wed May 14 16:05:40 2008 -0700

    memory hotplug: memmap_init_zone called twice
    
    __add_zone calls memmap_init_zone twice if memory gets attached to an empty
    zone.  Once via init_currently_empty_zone and once explictly right after that
    call.
    
    Looks like this is currently not a bug, however the call is superfluous and
    might lead to subtle bugs if memmap_init_zone gets changed.  So make sure it
    is called only once.
    
    Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3b7ec117bf6c98f5a845311c4ca5ca020a3d7689
Author: Nate Case <ncase@xes-inc.com>
Date:   Wed May 14 16:05:39 2008 -0700

    ipmi: support I/O resources in OF driver
    
    The current OF probing assumes that the resource is IORESOURCE_MEM.  This
    checks for the IORESOURCE_IO flag and behaves appropriately.  An I/O resource
    can exist with an ipmi device node on a legacy ISA bus.
    
    Signed-off-by: Nate Case <ncase@xes-inc.com>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 90898709dfca860d9550c85f0924007f4c0467ea
Author: Nicolas Ferre <nicolas.ferre@atmel.com>
Date:   Wed May 14 16:05:38 2008 -0700

    atmel_lcdfb: fix initialization of a pre-allocated framebuffer
    
    Fix initialization of framebuffer not calling ioremap_writecombine() function
    and not using internal SRAM for at91sam9rl.
    
    This is a little rework of the "Don't initialize a pre-allocated framebuffer"
    patch that corrects the call to ioremap_writecombine() function.
    
    It also cuts the use of internal SRAM for at91sam9rl : it is a bit small
    for a framebuffer.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: Andrew Victor <linux@maxim.org.za>
    Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3ef0f720e47e895b613b0305eb0a483e3ec11f23
Author: Miklos Szeredi <mszeredi@suse.cz>
Date:   Wed May 14 16:05:37 2008 -0700

    mm: fix infinite loop in filemap_fault
    
    filemap_fault will go into an infinite loop if ->readpage() fails
    asynchronously.
    
    AFAICS the bug was introduced by this commit, which removed the wait after the
    final readpage:
    
       commit d00806b183152af6d24f46f0c33f14162ca1262a
       Author: Nick Piggin <npiggin@suse.de>
       Date:   Thu Jul 19 01:46:57 2007 -0700
    
           mm: fix fault vs invalidate race for linear mappings
    
    Fix by reintroducing the wait_on_page_locked() after ->readpage() to make sure
    the page is up-to-date before jumping back to the beginning of the function.
    
    I've noticed this while testing nfs exporting on fuse.  The patch
    fixes it.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3b73a223661ed137c5d3d2635f954382e94f5a43
Author: Rene Herman <rene.herman@keyaccess.nl>
Date:   Wed May 14 16:05:36 2008 -0700

    pnp: add ISAPnP MPU option quirks
    
    The AD181x and AZT230 chips don't support an IRQ-less MPU401 option but
    work fine without one.  This adds (priority functional) IRQ-less options
    for each port option to help systems with few available IRQs.
    
    The AD1815 quirk can't use pnp_register_irq_resource() due to doubly
    penalizing the IRQ.  Also, while not a practical issue due to no IRQ
    option being present for the dependents, this needs to add in front, not
    back.
    
    Doesn't use pnp_register_port_resource() for symetry with above.
    
    This does not delete the AD1815 independent option even though it should
    be empty after the IRQ transfer due to AD1816 coming with an empty but
    still present independent option by default.
    
    Was tested on AD1815, AD1816 and AZT2320.  The ALSA snd-ad1818a driver
    also support the AZT2002 ID for MPU401 but this doesn't as I was unable to
    test it.
    
    Signed-off-by: Rene Herman <rene.herman@gmail.com>
    Tested-by: Uwe Bugla <uwe.bugla@gmx.de>
    Acked-by: Uwe Bugla <uwe.bugla@gmx.de>
    Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Takashi Iwai <tiwai@suse.de>
    Cc: Len Brown <len.brown@intel.com
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bc033c9b5fd261855278f4ed82c3713cc549afbe
Author: Rene Herman <rene.herman@keyaccess.nl>
Date:   Wed May 14 16:05:34 2008 -0700

    pnp: add pnp_build_option() to the API
    
    The subsequent AD181x quirk patch would like this as part of the API.
    pnp_register_dependent_option() adds to the same dependent chain the quirk is
    walking which is fairly unclean.  This enables a private option chain build
    which it can then just add onto the end when done.
    
    Signed-off-by: Rene Herman <rene.herman@gmail.com>
    Tested-by: Uwe Bugla <uwe.bugla@gmx.de>
    Acked-by: Uwe Bugla <uwe.bugla@gmx.de>
    Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Takashi Iwai <tiwai@suse.de>
    Cc: Len Brown <len.brown@intel.com
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 726a7a3d17f183bd0f93daff4d56953c6af78c57
Author: Rene Herman <rene.herman@gmail.com>
Date:   Wed May 14 16:05:33 2008 -0700

    pnp: clean up pnp_fixup_device()
    
    Make it look a bit more like pci_fixup_device/pci_do_fixups.  Also print
    the PnP ID and delete the () from the "foo+0x0/0x1234()".
    
    Signed-off-by: Rene Herman <rene.herman@gmail.com>
    Tested-by: Uwe Bugla <uwe.bugla@gmx.de>
    Acked-by: Uwe Bugla <uwe.bugla@gmx.de>
    Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Takashi Iwai <tiwai@suse.de>
    Cc: Len Brown <len.brown@intel.com
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 82f55af06af3d9c478292281ac37b48d2c43741e
Author: Jens Rottmann <JRottmann@LiPPERT-AT.de>
Date:   Wed May 14 16:05:32 2008 -0700

    fix "lxfb: extend PLL table to support dotclocks below 25 MHz"
    
    The following patch caused a regression with OLPC panels:
    
     commit 3888d4639e78802c4ec1086127124e890461b9e4
        lxfb: extend PLL table to support dotclocks below 25 MHz
    
        Extends the PLL frequency table of the AMD Geode-LX frame buffer driver to
        make use of the DIV4 bit, thus adding support for dotclocks between 6 and 25
        MHz.  These are needed for small LCDs (e.g.  320x240).  Also inserts some
        intermediate steps between pre-existing frequencies.
    
    The problem was the insertion of intermediate steps into the frequency
    table; they would cause the wrong frequency to be matched.  This patch
    drops those intermediate frequencies while keeping the sub-25MHz
    frequencies.
    
    Signed-off-by: Andres Salomon <dilinger@debian.org>
    Signed-off-by: Jens Rottmann <JRottmann@LiPPERT-AT.de>
    Tested-by: Andres Salomon <dilinger@debian.org>
    Acked-by: Jordan Crouse <jordan.crouse@amd.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8b8b498836942c0c855333d357d121c0adeefbd9
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Wed May 14 16:05:31 2008 -0700

    oprofile: don't request cache line alignment for cpu_buffer
    
    Alignment was previously requested because cpu_buffer was an [NR_CPUS]
    array, to avoid cache line sharing between CPUS.
    
    After commit 608dfddd845da5ab6accef70154c8910529699f7 (oprofile: change
    cpu_buffer from array to per_cpu variable ), we dont need to force an
    alignement anymore since cpu_buffer sits in per_cpu zone.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Cc: Mike Travis <travis@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f7c5a770e6006ae2b5f4fd0491565b69e4d4bb48
Author: Sebastian Siewior <bigeasy@linutronix.de>
Date:   Wed May 14 16:05:30 2008 -0700

    m68knommu: add info about removing mcfserial
    
    Schedule a removal for this driver. Alternative driver is available for
    a while now.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Acked-by: Greg Ungerer <gerg@uclinux.org>
    Acked-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 57cc097931e2d28a27e19515c549dc301ba6b6b2
Author: Grant Likely <grant.likely@secretlab.ca>
Date:   Wed May 14 16:05:29 2008 -0700

    mpc5200_psc_spi: typo fix in header block
    
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Acked-by: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 887b3ece65be7b643dfdae0d433c91a26a3f437d
Author: Eric Van Hensbergen <ericvh@opteron.9grid.us>
Date:   Thu May 8 20:26:37 2008 -0500

    9p: fix error path during early mount
    
    There was some cleanup issues during early mount which would trigger
    a kernel bug for certain types of failure.  This patch reorganizes the
    cleanup to get rid of the bad behavior.
    
    This also merges the 9pnet and 9pnet_fd modules for the purpose of
    configuration and initialization.  Keeping the fd transport separate
    from the core 9pnet code seemed like a good idea at the time, but in
    practice has caused more harm and confusion than good.
    
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 332c421e67045343de74e644cdf389f559f0d83f
Author: Eric Van Hensbergen <ericvh@opteron.9grid.us>
Date:   Sat May 3 17:29:26 2008 -0500

    9p: make cryptic unknown error from server less scary
    
    Right now when we get an error string from the server that we can't
    map we report a cryptic error that actually makes it look like we are
    reporting a problem with the client.  This changes the text of the log
    message to clarify where the error is coming from.
    
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit d0c447180bfcb1db8d59e6ddb10f0346bd7d29e9
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Sat May 3 17:29:50 2008 -0500

    9p: fix flags length in net
    
    Some files in the net/9p directory uses "int" for flags. This can
    cause hard to find bugs on some architectures. This patch converts the
    flags to use "long" instead.
    
    This bug was discovered by doing an allyesconfig make on the -rt kernel
    where checks are done to ensure all flags are of size sizeof(long).
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Acked-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 728fc4ef17748042d9c71144aa339ed9c68e8b01
Author: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date:   Fri Mar 7 11:40:33 2008 -0600

    9p: Correct fidpool creation failure in p9_client_create
    
    On error, p9_idpool_create returns an ERR_PTR-encoded errno.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Acked-by: Eric Van Hensbergen <ericvh@gmail.com>

commit c1549497e903a1ffa1c5808337a987180e480e7a
Author: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date:   Fri Mar 7 11:39:13 2008 -0600

    9p: use struct mutex instead of struct semaphore
    
    Replace semaphores protecting use flags with a mutex.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Acked-by: Eric Van Hensbergen <ericvh@gmail.com>

commit bb8ffdfc3e3b32ad9fcdb8da289088d3b22794e5
Author: Eric Van Hensbergen <ericvh@ericvh-desktop.(none)>
Date:   Fri Mar 7 10:53:53 2008 -0600

    9p: propagate parse_option changes to client and transports
    
    Propagate changes that were made to the parse_options code to the
    other parse options pieces present in the other modules.  Looks like
    the client parse options was probably corrupting the parse string
    and causing problems for others.
    
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit ab31267dfeddf80b2e483f077c8b03905993722b
Author: Jim Meyering <jim@meyering.net>
Date:   Thu Mar 6 17:10:28 2008 -0600

    fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure. Now that this function can fail, return an int, diagnose other option-parsing failures, and adjust the sole caller: (v9fs_session_init): Handle kstrdup failure. Propagate any new v9fs_parse_options failure "up".
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Cc: Ron Minnich <rminnich@sandia.gov>
    Cc: Latchesar Ionkov <lucho@ionkov.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Eric Van Hensbergen <ericvh@gmail.com>

commit ee443996a35c1e04f210cafd43d5a98d41e46085
Author: Eric Van Hensbergen <ericvh@ericvh-desktop.(none)>
Date:   Wed Mar 5 07:08:09 2008 -0600

    9p: Documentation updates
    
    The kernel-doc comments of much of the 9p system have been in disarray since
    reorganization.  This patch fixes those problems, adds additional documentation
    and a template book which collects the 9p information.
    
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit b32a09db4fb9a87246ba4e7726a979ac4709ad97
Author: Markus Armbruster <armbru@redhat.com>
Date:   Tue Feb 26 09:57:11 2008 -0600

    add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust
    
    match_strcpy() is a somewhat creepy function: the caller needs to make sure
    that the destination buffer is big enough, and when he screws up or
    forgets, match_strcpy() happily overruns the buffer.
    
    There's exactly one customer: v9fs_parse_options().  I believe it currently
    can't overflow its buffer, but that's not exactly obvious.
    
    The source string is a substing of the mount options.  The kernel silently
    truncates those to PAGE_SIZE bytes, including the terminating zero.  See
    compat_sys_mount() and do_mount().
    
    The destination buffer is obtained from __getname(), which allocates from
    name_cachep, which is initialized by vfs_caches_init() for size PATH_MAX.
    
    We're safe as long as PATH_MAX <= PAGE_SIZE.  PATH_MAX is 4096.  As far as
    I know, the smallest PAGE_SIZE is also 4096.
    
    Here's a patch that makes the code a bit more obviously correct.  It
    doesn't depend on PATH_MAX <= PAGE_SIZE.
    
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    Cc: Latchesar Ionkov <lucho@ionkov.net>
    Cc: Jim Meyering <meyering@redhat.com>
    Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit db973ffa11030e032acde47b4d6e958064311166
Merge: dd28642... cafa027...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 14:29:34 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      cs5520: disable VDMA
      ide/Kconfig: couple of fixes
      alim15x3: remove WDC_ALI15X3 config option
      alim15x3: add "wdc_udma" module parameter
      alim15x3: remove stale warning about ATI RS100 northbridge
      alim15x3: trivial cleanup for ali_set_pio_mode()
      make ide-iops.c:SELECT_MASK() static
      SWARM IDE: Fix up following changes to ide_hwif_t

commit cafa027b8cc6f605ccebc43a960644307a12d8dd
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    cs5520: disable VDMA
    
    Disable Virtual DMA support for now (it causes system hangs).
    
    Thanks to TAKADA Yoshihito for the help with debugging the problem.
    
    Reported-by: TAKADA Yoshihito <takada@mbf.nifty.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 64afc31f8976bda66e82a41aacb1f7e427fb179e
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    ide/Kconfig: couple of fixes
    
    * Don't ask to enable no longer existing config options
      ("Use DMA by default when available" and "Special UDMA Feature").
    
    * PIIX host driver doesn't support Victory66 chipset.
    
    * "ide0=cmd640_vlb" -> "cmd640.probe_vlb"
    
    * "ide=doubler" -> "gayle.doubler"
    
    * Amiga IDE doubler support is a feature for gayle host driver
      not a separate host driver.
    
    * Remove Andre's mail.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit e7f379d5cabb2790ecce5d623382fa6085e7686d
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    alim15x3: remove WDC_ALI15X3 config option
    
    There is "wdc_udma" module parameter now.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 63b1623ef0e33160d782fd1b0044e9a8af5d16cf
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    alim15x3: add "wdc_udma" module parameter
    
    Add "wdc_udma" module parameter for allowing UDMA transfers
    on M1543C-E chipset for WDC disks.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 2bf111d97a8c05d3fe436caaf18ba0634c9ab33d
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    alim15x3: remove stale warning about ATI RS100 northbridge
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit df98668f178c39c54bc7b9cd3adb99cbd7ed8ada
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed May 14 23:06:15 2008 +0200

    alim15x3: trivial cleanup for ali_set_pio_mode()
    
    Remove commented out code and stale comment.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit e0b4eb5193fed5c63413b0c137be29b0477d15ca
Author: Adrian Bunk <bunk@kernel.org>
Date:   Wed May 14 23:06:15 2008 +0200

    make ide-iops.c:SELECT_MASK() static
    
    SELECT_MASK() can now become static.
    
    [bart: remove space between function name and open parenthesis]
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 4d4423caaa1b9ca709ef6a911a030a3b6e68c46b
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Wed May 14 23:06:14 2008 +0200

    SWARM IDE: Fix up following changes to ide_hwif_t
    
     Following recent changes to ide_hwif_t update the SWARM IDE driver to use
    hw_regs_t to initialize port mapping.  Plus minor layout adjustments along
    the lines of other drivers.
    
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit dd286422fefdcff784e8d336deeb88ce817e14db
Merge: 4717df5... a58e58f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 13:32:43 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/cxgb3: Wrap the software send queue pointer as needed on flush
      IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long
      IB/ipath: Make ipath_portdata work with struct pid * not pid_t
      IB/ipath: Fix RDMA read response sequence checking
      IB/ipath: Fix many locking issues when switching to error state
      IB/ipath: Fix RC and UC error handling
      RDMA/nes: Fix up nes_lro_max_aggr module parameter

commit 4717df58304b60ac26cdb157d57f39ae1e3a336f
Merge: fc99824... c2b7bbe...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 13:31:25 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (70 commits)
      V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
      V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners
      V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic
      V4L/DVB (7895): tveeprom: update Hauppauge analog audio and video decoders
      V4L/DVB (7893): xc5000: bug-fix: allow multiple devices in a single system
      V4L/DVB (7891): cx18/ivtv: fix open() kernel oops
      V4L/DVB (7890): cx18: removed bogus and confusing conditional
      V4L/DVB (7889): cx18: improve HVR-1600 detection.
      V4L/DVB (7888): cx18: minor card definition updates.
      V4L/DVB (7887): cx18: fix Compro H900 analog support.
      V4L/DVB (7881): saa7134: fixed a compile warning in saa7134-core.c
      V4L/DVB (7880): saa7134: remove explicit GPIO initialization
      V4L/DVB(7879): Adding cx18 Support for mxl5005s
      V4L/DVB(7878): mxl55005s: Makefile and Kconfig additions
      V4L/DVB(7877): mxl5005s: Ensure debug is off
      V4L/DVB(7876): mxl5005s: Remove incorrect copyright holders
      V4L/DVB(7875): mxl5005s: Remove redundant functions
      V4L/DVB(7874): mxl5005s: Fix function statics
      V4L/DVB(7873): mxl5005s: Fix header includes.
      V4L/DVB(7872): mxl5005s: checkpatch.pl compliance
      ...

commit fc99824c427ed998e3c5e376bd9c640fde1c407c
Merge: e90a4e4... 0a3ad00...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 11:13:44 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
      Driver core: struct class remove children list
      block: do_mounts - accept root=<non-existant partition>

commit e90a4e475a8b34adbefe189c9d0932fa0b7b750f
Merge: 6aa5fc4... 4051770...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 10:52:40 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)
      USB: atmel_usba_udc fixes, mostly disconnect()
      USB: pxa27x_udc: minor fixes
      usbtest: comment on why this code "expects" negative and positive errnos
      USB: remove PICDEM FS USB demo (04d8:000c) device from ldusb
      USB: option: add new Dell 5520 HSDPA variant
      USB: unusual_devs: Add support for GI 0401 SD-Card interface
      USB: serial gadget: descriptor cleanup
      USB: serial gadget: simplify endpoint handling
      USB: serial gadget: remove needless data structure
      USB: serial gadget: cleanup/reorg
      usb: fix compile warning in isp1760
      USB: do not handle device 1410:5010 in 'option' driver
      USB: Fix unusual_devs.h ordering
      USB: add Zoom Telephonics Model 3095F V.92 USB Mini External modem to cdc-acm
      USB: Support for the ET502HS HDSPA modem in option driver
      USB: Support for the ET502HS HDSPA modem
      usb: fix integer as NULL pointer warnings found by sparse
      USB: isp1760: fix printk format
      USB: add Telstra NextG CDMA id to option driver
      USB: add association.h
      ...

commit 0a3ad00ca09632c6d0675f606276e92bdf1b306c
Author: Dave Young <hidave.darkstar@gmail.com>
Date:   Fri May 9 15:24:08 2008 +0800

    Driver core: struct class remove children list
    
    because of the class_device was removed, now do the children list removing
    
    Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 30f2f0eb4bd2c43d10a8b0d872c6e5ad8f31c9a0
Author: Kay Sievers <kay.sievers@vrfy.org>
Date:   Tue May 6 22:31:33 2008 +0200

    block: do_mounts - accept root=<non-existant partition>
    
    Some devices, like md, may create partitions only at first access,
    so allow root= to be set to a valid non-existant partition of an
    existing disk. This applies only to non-initramfs root mounting.
    
    This fixes a regression from 2.6.24 which did allow this to happen and
    broke some users machines :(
    
    Acked-by: Neil Brown <neilb@suse.de>
    Tested-by: Joao Luis Meloni Assirati <assirati@nonada.if.usp.br>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6aa5fc434958d15a4d66d922d0416dfb03c07def
Merge: 362a61a... 9ee6b7f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 14 10:08:24 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (73 commits)
      net: Fix typo in net/core/sock.c.
      ppp: Do not free not yet unregistered net device.
      netfilter: xt_iprange: module aliases for xt_iprange
      netfilter: ctnetlink: dump conntrack ID in event messages
      irda: Fix a misalign access issue. (v2)
      sctp: Fix use of uninitialized pointer
      cipso: Relax too much careful cipso hash function.
      tcp FRTO: work-around inorder receivers
      tcp FRTO: Fix fallback to conventional recovery
      New maintainer for Intel ethernet adapters
      DM9000: Use delayed work to update MII PHY state
      DM9000: Update and fix driver debugging messages
      DM9000: Add __devinit and __devexit attributes to probe and remove
      sky2: fix simple define thinko
      [netdrvr] sfc: sfc: Add self-test support
      [netdrvr] sfc: Increment rx_reset when reported as driver event
      [netdrvr] sfc: Remove unused macro EFX_XAUI_RETRAIN_MAX
      [netdrvr] sfc: Fix code formatting
      [netdrvr] sfc: Remove kernel-doc comments for removed members of struct efx_nic
      [netdrvr] sfc: Remove garbage from comment
      ...

commit 362a61ad61199e19a61b8e432015e2586b288f5b
Author: Nick Piggin <npiggin@suse.de>
Date:   Wed May 14 06:37:36 2008 +0200

    fix SMP data race in pagetable setup vs walking
    
    There is a possible data race in the page table walking code. After the split
    ptlock patches, it actually seems to have been introduced to the core code, but
    even before that I think it would have impacted some architectures (powerpc
    and sparc64, at least, walk the page tables without taking locks eg. see
    find_linux_pte()).
    
    The race is as follows:
    The pte page is allocated, zeroed, and its struct page gets its spinlock
    initialized. The mm-wide ptl is then taken, and then the pte page is inserted
    into the pagetables.
    
    At this point, the spinlock is not guaranteed to have ordered the previous
    stores to initialize the pte page with the subsequent store to put it in the
    page tables. So another Linux page table walker might be walking down (without
    any locks, because we have split-leaf-ptls), and find that new pte we've
    inserted. It might try to take the spinlock before the store from the other
    CPU initializes it. And subsequently it might read a pte_t out before stores
    from the other CPU have cleared the memory.
    
    There are also similar races in higher levels of the page tables. They
    obviously don't involve the spinlock, but could see uninitialized memory.
    
    Arch code and hardware pagetable walkers that walk the pagetables without
    locks could see similar uninitialized memory problems, regardless of whether
    split ptes are enabled or not.
    
    I prefer to put the barriers in core code, because that's where the higher
    level logic happens, but the page table accessors are per-arch, and open-coding
    them everywhere I don't think is an option. I'll put the read-side barriers
    in alpha arch code for now (other architectures perform data-dependent loads
    in order).
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 73f10281ea96d7e8b4fc1c5d755a7c8eb484155b
Author: Nick Piggin <npiggin@suse.de>
Date:   Wed May 14 06:35:11 2008 +0200

    read_barrier_depends arch fixlets
    
    read_barrie_depends has always been a noop (not a compiler barrier) on all
    architectures except SMP alpha. This brings UP alpha and frv into line with all
    other architectures, and fixes incorrect documentation.
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 405177070614f35133304d4daa1332afeb83ffa2
Author: David Brownell <david-b@pacbell.net>
Date:   Sat May 10 22:46:38 2008 -0700

    USB: atmel_usba_udc fixes, mostly disconnect()
    
    Various fixes to Atmel's high speed UDC driver.
    
      * Issue some missing disconnect() calls.  Currently they are only made
        when VBUS power goes away (on boards where the driver can sense such
        changes), but that's not enough for gadget drivers to clean out all
        the state that's needed.  Missing calls were:
    
          - After USB reset, before starting enumeration.
          - When unregistering a gadget driver, before unbind().
    
      * Don't assume gadget drivers provide disconnect callbacks; make sure
        to not call through a null pointer!
    
      * When the driver doesn't provide an unbind() callback, refuse to
        unregister it.
    
    Also remove two bogus "error" messages:
    
      * Related to mis-handling of disconnect() ... don't emit error messages
        for disconnect() handlers that disable endpoints.  All of them should
        be doing that; the problem is (unfixed) oddness in atmel_usba_udc.
    
      * Don't emit a diagnostic for a curious and transient nonfatal error
        that shows up sometimes with EP0.
    
    Those messages spammed syslog, for no good reason.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 5a59bc544d00923ff715e2fe68ea537153f52dda
Author: Robert Jarzmik <rjarzmik@free.fr>
Date:   Mon May 12 10:47:56 2008 -0700

    USB: pxa27x_udc: minor fixes
    
    Minor fixes to pxa27x udc driver :
     - don't clobber driver model bus_id field
     - wrong endianess fix (no functional change; cpu is little-endian)
     - double udc disable fix
     - resume/suspend fix (OTG hold bit)
     - make driver pxa27x dependant (check cpu at runtime)
    
    Signed-off-by: Robert Jarzmik <rjarzmik@free.fr>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6def755320a214ae149ad6bc69eb8c1d7887e678
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Mon May 12 20:17:25 2008 +0200

    usbtest: comment on why this code "expects" negative and positive errnos
    
    On Mon, May 12, 2008 at 01:02:22AM -0700, David Brownell wrote:
    > On Sunday 11 May 2008, Marcin Slusarz wrote:
    > >
    > > test_ctrl_queue expects (?) positive and negative errnos.
    > > what is going on here?
    >
    > The sign is just a way to flag something:
    >
    >                 /* some faults are allowed, not required */
    >
    > The negative ones are required.  Positive codes are optional,
    > in the sense that, depending on how the peripheral happens
    > to be implemented, they won't necessarily be triggered.
    >
    > For example, the test to fetch a device qualifier desriptor
    > must succeed if the device is running at high speed.  So that
    > test is marked as negative.  But when it's full speed, it
    > could legitimately fail; marked as positive.  And so on for
    > other tests.
    >
    > Look at how the codes are *interpreted* to see it work.
    
    Lets document it.
    
    Based on comment from David Brownell <david-b@pacbell.net>.
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 5fc89390f74ac42165db477793fb30f6a200e79c
Author: Xiaofan Chen <xiaofanc@gmail.com>
Date:   Tue May 13 21:52:00 2008 +0800

    USB: remove PICDEM FS USB demo (04d8:000c) device from ldusb
    
    Microchip has changed the PICDEM FS USB demo device (0x04d8:000c)
    to use bulk transfer and not interrupt transfer. So I've updated the libusb
    based program here (Post #31).
    	http://forum.microchip.com/tm.aspx?m=106426&mpage=2
    
    So I believe that the in-kernel ldusb driver will no longer work with the
    demo firmware.  It should be removed.
    
    
    Signed-off-by: Xiaofan Chen <xiaofanc@gmail.com>
    Cc: Michael Hund <MHund@LD-Didactic.de>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 96cb15cf977356d9d3117dd88f3fe187d6024f4b
Author: Dan Williams <dcbw@redhat.com>
Date:   Tue May 13 12:53:45 2008 -0400

    USB: option: add new Dell 5520 HSDPA variant
    
    New variant of the 5520 found by Luke Sheldrick.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit e7c6f80fd733218aa1e79efa5d9ece9f76966160
Author: Filip Aben <f.aben@option.com>
Date:   Thu May 8 10:48:12 2008 -0700

    USB: unusual_devs: Add support for GI 0401 SD-Card interface
    
    Enables the SD-Card interface on the GI 0401 HSUPA card from Option.
    
    The unusual_devs.h entry is necessary because the device descriptor is
    vendor-specific. That prevents usb-storage from binding to it as an
    interface driver.
    
    This revised patch adds a small comment explaining why and reduces the
    rev range.
    
    T:  Bus=02 Lev=01 Prnt=01 Port=06 Cnt=01 Dev#=  3 Spd=480 MxCh= 0
    D:  Ver= 2.00 Cls=ff(vend.) Sub=ff Prot=ff MxPS=64 #Cfgs=  1
    P:  Vendor=0af0 ProdID=7401 Rev= 0.00
    S:  Manufacturer=Option N.V.
    S:  Product=Globetrotter HSUPA Modem
    C:* #Ifs=10 Cfg#= 1 Atr=80 MxPwr=500mA
    I:* If#= 0 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 0 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 1 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 2 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 2 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 3 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 3 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 4 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 4 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 5 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 5 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 6 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 6 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 7 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 7 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 8 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=89(I) Atr=03(Int.) MxPS=  64 Ivl=2ms
    E:  Ad=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 9 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
    E:  Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=8b(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    
    Signed-off-by: Filip Aben <f.aben@option.com>
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit b9370332f4879360ef7126f7a19c660e87084290
Author: David Brownell <david-b@pacbell.net>
Date:   Wed May 7 14:27:37 2008 -0700

    USB: serial gadget: descriptor cleanup
    
    Bugfix some serial gadget descriptors:
    
     - Stop mangling the low bits (controller type ID) of bcdDevice;
       just use the high bits for a driver revision code.
    
     - Serial numbers that aren't specific to individual devices
       are useless; stop reporting "0" for this.
    
     - Since it's not part of a CDC-conformant function, the "bulk only"
       configuration shouldn't be using "CDC Data" as its interface class.
       Switch over to using CLASS_VENDOR_SPEC (different value, 0xff).
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Al Borchers <alborchers@steinerpoint.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 734d37c654569f03156f8603a9761c402a73aa20
Author: David Brownell <david-b@pacbell.net>
Date:   Wed May 7 14:25:24 2008 -0700

    USB: serial gadget: simplify endpoint handling
    
    Switch serial gadget away from a *very* old idiom:  just remember
    the endpoints we'll be using, instead of looking them up by name
    each time.  This is a net code and data (globals) shrink.
    
    Also fix a small memory leak in the rmmod path, by working the
    same as the disconnect code.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Al Borchers <alborchers@steinerpoint.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2c2d28a015f0dd36c5d1a06e16923e3142574066
Author: David Brownell <david-b@pacbell.net>
Date:   Wed May 7 14:24:10 2008 -0700

    USB: serial gadget: remove needless data structure
    
    This removes a needless data structure from the serial gadget code;
    it's a small code shrink, and a larger data shrink.
    
    Since "struct usb_request" already has a "struct list_head" reserved
    for use by gadget drivers, the serial gadget code doesn't need to
    allocate wrapper structs to hold that list ... it can (and should!)
    just use the list_head provided for that exact use.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Al Borchers <alborchers@steinerpoint.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 9079e91b5b5a84836e65cdc9128d2602e3beaef2
Author: David Brownell <david-b@pacbell.net>
Date:   Wed May 7 16:00:36 2008 -0700

    USB: serial gadget: cleanup/reorg
    
    Some cleanup/reorg of g_serial ... simplifying it, and disentangling
    its structure so morphing it into a "function" driver (combinable with
    other interfaces) should be less painful.
    
     - Remove most forward declarations
         * put tty and gadget driver structs after their contents
         * snug module init/exit decls next to their functions
         * reordered some functions
    
     - Other cleanup:
         * convert a funky macro to an inline function
         * snug up module params next to their declarations
         * add missing driver.owner
         * add separator lines between major driver sections
    
     - Add comments re potential parameter/#define changes:
         * only supports one port (shrank GS_NUM_PORTS)
         * changing from 9600-8-N-1 affects multiple sites
    
     - Remove net2280-specific optimization ... it was being done
       way too late, can be done by net2280 module options, and in
       any case doesn't matter at any sane serial data rates.
    
    There are no behavioral changes, but the macro thing saves I-space.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Al Borchers <alborchers@steinerpoint.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit fe312e77f0ed4349e908b1575be0d4308f0b2ce4
Author: Sebastian Siewior <bigeasy@linutronix.de>
Date:   Mon May 5 09:31:50 2008 +0200

    usb: fix compile warning in isp1760
    
    drivers/usb/host/isp1760-if.c:275: warning: 'ret' is used uninitialized in this function
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit cdafc37a7b727b75ced65e31e47dafbd8b70f97f
Author: Eugeniy Meshcheryakov <eugen@debian.org>
Date:   Mon May 5 01:24:38 2008 +0200

    USB: do not handle device 1410:5010 in 'option' driver
    
    This device is not a serial port, but a virtual CD-ROM device. For
    example with my Novatel MC950D:
    
    lsusb -v -d 1410:5010 | grep InterfaceClass
          bInterfaceClass         8 Mass Storage
    
    After some time (ca. 5min) or if virtual CD is ejected, device id
    changes to 1410:4400:
    
    % lsusb -v -d 1410:4400 | grep InterfaceClass
          bInterfaceClass       255 Vendor Specific Class
          bInterfaceClass       255 Vendor Specific Class
    
    Variable name says that 0x5010 is a Novatel U727, but searching in
    internet shows, that this device also provides virtual CD that should be
    ejected before use. Product id for serial port in this case is 0x4100.
    
    Signed-off-by: Eugeniy Meshcheryakov <eugen@debian.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ed3e8fcaeb67b7c2c96eb9c30d5b98816a08a1a2
Author: Phil Dibowitz <phil@ipom.com>
Date:   Sat May 3 18:04:30 2008 -0700

    USB: Fix unusual_devs.h ordering
    
    This patch fixes ordering problems with entries in unusual_devs.h.
    
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6149ed5e3a6207595bd7362af7724d64f44af216
Author: Iain McFarlane <iain@imcfarla.homelinux.net>
Date:   Sun May 4 00:13:49 2008 +0100

    USB: add Zoom Telephonics Model 3095F V.92 USB Mini External modem to cdc-acm
    
    The patch below is a necessary workaround to support the Zoom Telephonics Model 3095F V.92 USB Mini External modem, which fails to initialise properly during normal probing thus:
    
    May  3 22:53:00 imcfarla kernel: drivers/usb/class/cdc-acm.c: Zero length descriptor references
    May  3 22:53:00 imcfarla kernel: cdc_acm: probe of 5-2:1.0 failed with error -22
    
    Adding the patch below causes the probing section to be skipped, and the modem
    then initialises correctly.
    
    Signed-off-by: Iain McFarlane <iain@imcfarla.homelinux.net>
    Acked-by: Oliver Neukum <oneukum@suse.de>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 4c7d3137fe4fce634d55a6e99c95dff4c6306702
Author: andreoli@samba.ing.unimo.it <andreoli@samba.ing.unimo.it>
Date:   Thu May 1 19:26:16 2008 +0200

    USB: Support for the ET502HS HDSPA modem in option driver
    
    the proposed patch allows the ET502HS HDSPA modem to be handled by the
    "option" driver. It has been tested for 1 month and works reliably (no
    oopses, no hangs, 300KB/s throughput).
    
    Signed-off-by: Mauro Andreolini <andreoli@weblab.ing.unimo.it>
    Signed-off-by: Matthias Urlichs <matthias@urlichs.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit dddcb8b7d419b6726ba07efe53e6bb216a9e86cb
Author: andreoli@samba.ing.unimo.it <andreoli@samba.ing.unimo.it>
Date:   Thu May 1 19:17:28 2008 +0200

    USB: Support for the ET502HS HDSPA modem
    
    The attached patch allows to bypass the ZeroCD mechanism for the ET502HS
    HDSPA modem, so that it can be mounted as a network device.
    
    Signed-off-by: Mauro Andreolini <andreoli@weblab.ing.unimo.it>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit af3d305ca71fea5dfdeba4bcecf2f91fa16dfa9d
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Apr 30 15:03:41 2008 -0700

    usb: fix integer as NULL pointer warnings found by sparse
    
    drivers/usb/host/ohci-sm501.c:93:24: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3254:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3267:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3277:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3285:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3293:9: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 220264733d3fb126c5ffd71ce897d918ce491c62
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Wed Apr 30 13:53:54 2008 -0700

    USB: isp1760: fix printk format
    
    Fix printk format warnings in isp1760 (in linux-next):
    
    next-20080430/drivers/usb/host/isp1760-hcd.c:994: warning: format '%d' expects type 'int', but argument 6 has type 'size_t'
    next-20080430/drivers/usb/host/isp1760-hcd.c:1092: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 23cacd65f65956426bbca25964a68c174db83a31
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 8 23:03:04 2008 +0200

    USB: add Telstra NextG CDMA id to option driver
    
    As reported by Magnus Boman <captain.magnus@opensuse.org>
    
    Cc: Magnus Boman <captain.magnus@opensuse.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit d23039eec77473124c9635c01378314f196f2211
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri Apr 25 19:23:16 2008 -0700

    USB: add association.h
    
    This will be used by the wireless usb code, as well as potentially other
    USB code.
    
    Originally based on some .c code written by Inaky Perez-Gonzalez
    <inaky.perez-gonzalez@intel.com>
    
    Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2e5f10e4f0a9649186d8a8c793822b2e0dae8373
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Wed Apr 30 15:37:19 2008 -0400

    USB: create attributes before sending uevent
    
    This patch (as1087d) fixes a long-standing problem in usbcore: Device,
    interface, and endpoint attributes aren't added until _after_ the
    creation uevent has already been broadcast.
    
    Unfortunately there are a few attributes which cannot be created that
    early.  The "descriptors" attribute is binary and so must be created
    separately.  The power-management attributes can't be created until
    the dev/power/ group exists.  And the interface string can vary from
    one altsetting to another, so it has to be created dynamically.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6986a978eec70c867717fe6bee736f0bd1db1508
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 2 12:02:20 2008 -0700

    USB: add new moto_modem driver for some Morotola phones
    
    This should work on a KRZR K1m, and some other Motorola phones that do
    not use the "standard" cdc ACM protocol to talk to USB hosts.
    
    Tested-by: Jeff Garzik <jeff@garzik.org>
    Cc: Jiang Dejun <a5652c@motorola.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 9ee6b7f1556e7889eff4666483b1b554d4686cd4
Author: Rami Rosen <ramirose@gmail.com>
Date:   Wed May 14 03:50:03 2008 -0700

    net: Fix typo in net/core/sock.c.
    
    In sock_queue_rcv_skb()  (net/core/sock.c) it should be:
    "Cast sk->rcvbuf ..." instead of: "Cast skb->rcvbuf ..."
    
    Signed-off-by: Rami Rosen <ramirose@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4b95ede6f6116ae1c0ed9605ec97d856c4814569
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Tue May 13 23:51:18 2008 -0700

    ppp: Do not free not yet unregistered net device.
    
    An error path in ppp_create_interface() lacks one and may
    BUG in free_netdev() checking for proper dev->reg_state.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 01b7a314291b2ef56ad718ee1374a1bac4768b29
Author: Phil Oester <kernel@linuxace.com>
Date:   Tue May 13 23:27:48 2008 -0700

    netfilter: xt_iprange: module aliases for xt_iprange
    
    Using iptables 1.3.8 with kernel 2.6.25, rules which include '-m
    iprange' don't automatically pull in xt_iprange module.  Below patch
    adds module aliases to fix that.  Patch against latest -git, but seems
    like a good candidate for -stable also.
    
    Signed-off-by: Phil Oester <kernel@linuxace.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1eedf69993d4016428fd99ffd619e73b374be3c1
Author: Eric Leblond <eric@inl.fr>
Date:   Tue May 13 23:27:11 2008 -0700

    netfilter: ctnetlink: dump conntrack ID in event messages
    
    Conntrack ID is not put (anymore ?) in event messages. This causes
    current ulogd2 code to fail because it uses the ID to build a hash in
    userspace. This hash is used to be able to output the starting time of
    a connection.
    
    Conntrack ID can be used in userspace application to maintain an easy
    match between kernel connections list and userspace one. It may worth
    to add it if there is no performance related issue.
    
    [ Patrick: it was never included in events, but really should be ]
    
    Signed-off-by: Eric Leblond <eric@inl.fr>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 332223831e86b2e17b48b4afafad07d8e3b73861
Author: Graf Yang <graf.yang@analog.com>
Date:   Tue May 13 23:25:57 2008 -0700

    irda: Fix a misalign access issue. (v2)
    
    Replace u16ho with put/get_unaligned functions
    
    Signed-off-by: Graf Yang <graf.yang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c1cc678adaa78ae2aab6a6d699241ad516d84476
Author: Patrick McHardy <kaber@trash.net>
Date:   Tue May 13 23:25:00 2008 -0700

    sctp: Fix use of uninitialized pointer
    
    Introduced by c4492586 (sctp: Add address type check while process
    paramaters of ASCONF chunk):
    
    net/sctp/sm_make_chunk.c: In function 'sctp_process_asconf':
    net/sctp/sm_make_chunk.c:2828: warning: 'addr_param' may be used uninitialized in this function
    net/sctp/sm_make_chunk.c:2828: note: 'addr_param' was declared here
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5e0f8923f350ff522f8f6aecf198df045af3615f
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Tue May 13 23:23:55 2008 -0700

    cipso: Relax too much careful cipso hash function.
    
    The cipso_v4_cache is allocated to contain CIPSO_V4_CACHE_BUCKETS
    buckets. The CIPSO_V4_CACHE_BUCKETS = 1 << CIPSO_V4_CACHE_BUCKETBITS,
    where CIPSO_V4_CACHE_BUCKETBITS = 7.
    
    The bucket-selection function for this hash is calculated like this:
    
      bkt = hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
                                         ^^^
    
    i.e. picking only 4 buckets of possible 128 :)
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c2b7bbea83b239b1877f3cafe0cdcbbd08e65648
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed May 14 05:08:19 2008 -0300

    V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
    
    As reported by Ingo Molnar:
    
    x86.git testing found the following build failure:
    
      drivers/built-in.o: In function `pvr2_dvb_feed_thread':
      pvrusb2-dvb.c:(.text+0x127e78): undefined reference to `dvb_dmx_swfilter'
      drivers/built-in.o: In function `pvr2_dvb_adapter_exit':
      pvrusb2-dvb.c:(.text+0x128357): undefined reference to `dvb_net_release'
      pvrusb2-dvb.c:(.text+0x12836f): undefined reference to `dvb_dmxdev_release'
      [...]
    
    with this config:
    
      CONFIG_VIDEO_PVRUSB2=y
      CONFIG_DVB_CORE=m
    
    i.e. pvrusb2 is built-in, dvb-core is modular.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 2ea336dc117098ef917ca9a19e911d15490587cc
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed May 14 04:57:36 2008 -0300

    V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners
    
    - MEDIA_ATTACH now applies also for V4L;
    
    - select a FW_LOADER dependent driver should happen only if HOTPLUG;
    
    - apply the common tuner dependency to all tuners. This helps to avoid latter
      issues.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 039d40019f3c5e26ea50ec5af4270189f63365e1
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed May 14 04:36:22 2008 -0300

    V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic
    
    If one of DVB_CORE or VIDEO_DEV is a module, the modules that can be used by
    both DVB and V4L cores should also be a module, otherwise, it will break its
    dependencies. This Kconfig logic implements the following:
    
    CONFIG_VIDEO_DEV        CONFIG_DVB_CORE         CONFIG_VIDEO_MEDIA
            N                       N                       N
            N                       M                       M
            N                       Y                       Y
            M                       N                       M
            M                       M                       M
            M                       Y                       M
            Y                       N                       Y
            Y                       M                       M
            Y                       Y                       Y
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit ee04e0faad386141f52dd812f220a2f0d128f1c6
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Tue May 13 01:25:24 2008 -0300

    V4L/DVB (7895): tveeprom: update Hauppauge analog audio and video decoders
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 48723543aff1f46091840222490ded5fe09c0e37
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sat May 10 14:34:09 2008 -0300

    V4L/DVB (7893): xc5000: bug-fix: allow multiple devices in a single system
    
    The current code passes a context pointer in the xc5000_config struct.
    This context pointer is used in the tuner_callback function, used to
    reset the device after firmware download.
    
    The xc5000_config struct is a static structure, whose .priv member was
    being assigned before calling xc5000_attach().  If there are more than
    one of the same device type installed on a single system, the last one
    to assign xc5000_config.priv will "win", and all others will cease to
    function properly.
    
    This patch passes the context pointer in xc5000_attach() rather that
    storing it within the static struct xc5000_config.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 07c87a833e9ef92280ed24ab85cd4eb49cbca9c0
Author: Andy Walls <awalls@radix.net>
Date:   Mon May 12 15:01:27 2008 -0300

    V4L/DVB (7891): cx18/ivtv: fix open() kernel oops
    
    Upon error conditions in cx18/ivtv_probe(), the code at the 'err:' label
    leaves a NULL entry in cx18/ivtv_cards[]. This can cause a NULL pointer
    de-reference in cx18/ivtv_v4l2_open() which is fixed by this patch.
    
    Signed-off-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit cba627a51a26eaed3526c423f5fd0410dd721ae2
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 12 14:48:26 2008 -0300

    V4L/DVB (7890): cx18: removed bogus and confusing conditional
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 1d081601315f5c9b9537b702bcb2c8d96fc089ef
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 12 14:45:19 2008 -0300

    V4L/DVB (7889): cx18: improve HVR-1600 detection.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 6b13cf164958a18436075fdae31f8bd9442353fa
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 12 14:00:33 2008 -0300

    V4L/DVB (7888): cx18: minor card definition updates.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 9dcbf35afb7359466efdf7fb81ee32f3ae2d56a3
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 12 13:57:18 2008 -0300

    V4L/DVB (7887): cx18: fix Compro H900 analog support.
    
    Tuner, S-Video and Composite are all working for the Compro H900.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 6db6ae2165863e26b7f41af54a8cf1ef9051a608
Author: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Date:   Mon May 12 20:34:02 2008 -0300

    V4L/DVB (7881): saa7134: fixed a compile warning in saa7134-core.c
    
    patch 779169257208 made the variable mask unnecessary.
    This patch just removes the declaration.
    
    Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit c1d6861b5178c184d78ae5f239cbaa9c2c63dd72
Author: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Date:   Thu May 8 22:57:20 2008 -0300

    V4L/DVB (7880): saa7134: remove explicit GPIO initialization
    
    This causes a problem with the audio mute on some cards and is done
    implictly in the audio initialization code.
    
    Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 671294719628f1671faefd4882764886f8ad08cb
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 07:23:23 2008 -0300

    V4L/DVB(7879): Adding cx18 Support for mxl5005s
    
    Adding cx18 Support
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 9426954277aa57e0417d89bfe3e0964d6901cfa3
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 8 12:14:40 2008 -0300

    V4L/DVB(7878): mxl55005s: Makefile and Kconfig additions
    
    Makefile and Kconfig additions
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 77ad55ec2159735b1b88a006a90f8dd2ffe291ca
Author: Steven Toth <stoth@hauppauge.com>
Date:   Sat May 3 14:28:43 2008 -0300

    V4L/DVB(7877): mxl5005s: Ensure debug is off
    
    Ensure debug is off
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 7fa2a1462fe0a258fb629f8447f31c1b3a6d6c68
Author: Steven Toth <stoth@hauppauge.com>
Date:   Sat May 3 14:25:55 2008 -0300

    V4L/DVB(7876): mxl5005s: Remove incorrect copyright holders
    
    I was informed by Jan Hoogenraad that two people needed to be removed
    from the original copyright comments.
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 90257e787faaf5ebfaa1839917e4dc6c5c104c14
Author: Steven Toth <stoth@hauppauge.com>
Date:   Sat May 3 14:21:58 2008 -0300

    V4L/DVB(7875): mxl5005s: Remove redundant functions
    
    Remove redundant functions
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit c6c34b1ffd40e00191e05bf0ef543a35ccd7d75d
Author: Steven Toth <stoth@hauppauge.com>
Date:   Sat May 3 14:14:54 2008 -0300

    V4L/DVB(7874): mxl5005s: Fix function statics
    
    Fix function statics
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 66321ba94f59ea7ba6f4451c51e171f5b30f1fd7
Author: Steven Toth <stoth@hauppauge.com>
Date:   Sat May 3 13:51:11 2008 -0300

    V4L/DVB(7873): mxl5005s: Fix header includes.
    
    Ensure we have the correct .h dependencies included.
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit d211017b954436bfc516e93d839e8746ec2bbbfe
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 19:35:54 2008 -0300

    V4L/DVB(7872): mxl5005s: checkpatch.pl compliance
    
    4 exceptions where the code would read very ugly otherwise.
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 48937295a63b4e81db907605afcbd81e0464b00f
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 07:15:38 2008 -0300

    V4L/DVB(7871): mxl5005s: Re-org code and update copyrights
    
    Re-org code and update copyrights
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 5c1b20514f592af19974166f130b85346c1fbf3a
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 07:04:09 2008 -0300

    V4L/DVB (7870): mxl5005s: Basic digital support.
    
    ATSC and QAM should be working but basic testing is required.
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 7f5c3affef2883f49e820db62413e1dff1d4cebb
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 06:51:36 2008 -0300

    V4L/DVB(7869): mxl5005s: Cleanup #6
    
    Cleanup #6
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 8c66a19d45fb5b88abf10678db353f35179a2cde
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 06:35:48 2008 -0300

    V4L/DVB (7868): mxl5005s: Cleanup #5
    
    Cleanup #5
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 85d220d03b70180b9958b29d43e99c7135f00654
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 05:48:14 2008 -0300

    V4L/DVB (7867): mxl5005s: Cleanup #4
    
    Cleanup #4
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 3935c25484bc632b12c447e19c4eacbf5de5f7ae
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 05:45:44 2008 -0300

    V4L/DVB (7866): mxl5005s: Cleanup #3
    
    Cleanup #3
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit a8214d48e6d41f3a16c1023ca4f30bbd140ba756
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 05:02:58 2008 -0300

    V4L/DVB (7865): mxl5005s: Cleanup #2
    
    Cleanup #2
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 2637d5b498b979b46a01690d22ecca1e5b79b903
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 05:01:31 2008 -0300

    V4L/DVB (7864): mxl5005s: Cleanup #1
    
    Cleanup #1
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 52c99bda04d8bb1fb390821695b0f9efc1e1db44
Author: Steven Toth <stoth@hauppauge.com>
Date:   Thu May 1 04:57:01 2008 -0300

    V4L/DVB (7862): Add mxl5505s driver for MaxiLinear 5505 chipsets
    
    Initial check-in of the original driver to establish history.
    
    Signed-off-by: Chia-Ling Lu Developer <chialing@realtek.com.tw>
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit e4671b6bc0b5b488adc5acbcfcbfa6661abec94e
Author: Matthias Schwarzott <zzam@gentoo.org>
Date:   Wed Apr 30 12:21:04 2008 -0300

    V4L/DVB (7861): mt312: Prefix functions only with mt312_, Add zl10313 to kconfig description
    
    This patch does some small cleanup to mt312.
    It changes kconfig description to also list the ZL10313.
    
    It does change some strange symbol names to be consistent with
    module name mt312 and naming of all other functions in there.
    * vp310_mt312_ops -> mt312_ops
    * vp310_mt312_attach -> mt312_attach
    
    Adds a MODULE_AUTHOR for me
    
    Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 6d8425b1e38f69e349818299f245d35fb5c3a7d5
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 5 18:25:22 2008 -0300

    V4L/DVB (7860a): Add MAINTAINERS for cx18
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 7fb0fd05b2f03065ca4743e8c7446ec86329c4c8
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date:   Mon May 5 14:12:30 2008 -0300

    V4L/DVB (7859): mt9v022: fix a copy-paste error in comment
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 91e64c884295c7347f9ea78347d5a5e2df2441f6
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon May 5 13:57:50 2008 -0300

    V4L/DVB (7858): video: build fix for drivers/media/video/mt9v022.c
    
    x86.git testing found the following build bug on latest -git:
    
      CC [M]  drivers/media/video/mt9v022.o
      drivers/media/video/mt9v022.c: In function 'bus_switch_request':
      drivers/media/video/mt9v022.c:199: error: implicit declaration of function 'gpio_is_valid'
      drivers/media/video/mt9v022.c:201: error: implicit declaration of function 'gpio_request'
      drivers/media/video/mt9v022.c:207: error: implicit declaration of function 'gpio_direction_output'
      drivers/media/video/mt9v022.c:211: error: implicit declaration of function 'gpio_free'
      drivers/media/video/mt9v022.c: In function 'bus_switch_act':
      drivers/media/video/mt9v022.c:237: error: implicit declaration of function 'gpio_set_value_cansleep'
      make[2]: *** [drivers/media/video] Error 2
      make[1]: *** [drivers/media] Error 2
      make[1]: *** Waiting for unfinished jobs....
      make: *** [drivers] Error 2
    
    with this config:
    
       http://redhat.com/~mingo/misc/config-Sat_May__3_16_08_39_CEST_2008.bad
    
    the bug was that the driver uses GPIO functionality but only includes
    the GPIO interface definitions for the CONFIG_MT9M001_PCA9536_SWITCH
    case, which was not set in this config.
    
    The quick fix seems to be to include linux/gpio.h unconditionally. (this
    seems like a small cleanup as well as it removes and #ifdef is more
    robust than an inclusion of asm/gpio.h) Not tested too much yet, so
    please have another look in any case.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 4ed83b51d3669628d970c2fea604064d2e0ac6af
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon Apr 28 15:39:09 2008 -0300

    V4L/DVB (7857): make itd1000_fre_values[] static const
    
    itd1000_fre_values[] can become static const.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 50510993e0452e0941fd03f63aa08256dd9c7fdc
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon May 5 18:25:22 2008 -0300

    V4L/DVB (7856): cx18/: possible cleanups
    
    This patch contains the following possible cleanups:
    - cx18-i2c.c should #include "cx18-i2c.h" for getting the prototypes of
      it's global functions
    - make the following needlessly global functions static:
      - cx18-fileops.c:cx18_claim_stream()
      - cx18-fileops.c:cx18_release_stream()
      - cx18-queue.c:cx18_queue_move()
    - remove the following unused functions:
      - cx18-driver.c:cx18_waitq()
      - cx18-queue.c:cx18_buf_copy_from_user()
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 3f98387efa9333c5765d36e144c47c107d6ba64a
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Thu May 1 10:31:12 2008 -0300

    V4L/DVB (7854): cx18/ivtv: improve and fix out-of-memory handling
    
    - don't show kernel backtrace when the allocation of the buffers fails: the
      normal ivtv/cx18 messages are clear enough and the backtrace scares users.
    - fix cleanup after the buffer allocation fails (caused kernel panic).
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 6a4a79355bfa9ae6977556595a68f2e3a0e143f7
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Thu May 1 09:34:54 2008 -0300

    V4L/DVB (7853): ivtv/cx18: fix compile warnings
    
    Fix compile warnings if MODULE is not defined.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit feb5bce24ed4d90c0a5710a669072c778a2c5148
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Thu May 1 09:22:13 2008 -0300

    V4L/DVB (7852): ivtv: prefix ivtv external functions with ivtv_
    
    Fix conflict with cx18 driver.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 755a18baad393836c88ce92c3b7198c70e2e3205
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Tue May 6 14:09:01 2008 -0300

    V4L/DVB (7851): Fix FW_LOADER depencency at v4l/dvb
    
    Since:
    1) FW_LOADER is defined as:
    
    config FW_LOADER
            tristate "Userspace firmware loading support"
            depends on HOTPLUG
    
    2) several V4L/DVB driver just selects it;
    
    3) select is not smart enough to auto-select HOTPLUG, if select FW_LOADER.
    
    So, All drivers that select FW_LOADER should also depend on HOTPLUG.
    
    An easier solution (for the end-user perspective) would be to "select HOTPLUG".
    However, live is not simple. This would cause recursive dependency issues like
    this one:
    
    drivers/usb/Kconfig:62:error: found recursive dependency: USB -> USB_OHCI_HCD
    -> I2C -> MEDIA_TUNER -> MEDIA_TUNER_XC2028 -> HOTPLUG -> PCCARD -> PCMCIA ->
    USB_ARCH_HAS_HCD -> MOUSE_APPLETOUCH -> USB
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit ec44c9aed0eddceaef3c6b4d23f6d7702ec57b4d
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Tue May 6 13:46:12 2008 -0300

    V4L/DVB (7849): cx88: fix Kconfig depencencies for FW_LOADER
    
    cx88 doesn't need support for FW_LOADER. Instead, this is required only for
    cx88-blackbird.
    
    Also, cx88-blackbird depends on HOTPLUG, due to FW_LOADER dependency.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit eabcaf32041fcd04672049e76124bd4cd63b1cbf
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Tue May 6 13:44:03 2008 -0300

    V4L/DVB (7848): Fix dependencies for tuner-xc2028 and em28xx-dvb
    
    em28xx-dvb doesn't need FW_LOADER. Instead, tuner-xc2028 needs to select
    FW_LOADER.
    
    Also, this can happen only if HOTPLUG is selected, since FW_LOADER
    is dependent on HOTPLUG.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 3929c0f9acc62a2fee99387b3cb58fd2a3668cd3
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Tue May 6 12:38:24 2008 -0300

    V4L/DVB (7847): Simplifies Kconfig rules
    
    Since all tuners are dependent of I2C, move I2C dependency to MEDIA_TUNER.
    Also, simplifies the dependencies for the other Kconfig items.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit fdbbfb092cee0d826cba96df51f56c0e22cae579
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Tue May 6 12:35:58 2008 -0300

    V4L/DVB (7846): Re-creates VIDEO_TUNER
    
    VIDEO_TUNER is responsible for compilation of tuners.ko module. This were the
    previous behaviour before the creation of MEDIA_TUNER.
    
    Before this patch, tuner.ko were created even for drivers that don't need a
    tuner (like webcam drivers).
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 4bd5d1071ddbb35ae545c7738e6411e50ce28b17
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 4 21:32:21 2008 -0300

    V4L/DVB (7844): tda18271: add tda_fail macro to log error cases
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 10ed0bf4af00c25590e8bfca344d8dec5c3637ae
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 4 20:26:47 2008 -0300

    V4L/DVB (7843): tda18271: fix error handling in tda18271c1_rf_tracking_filter_calibration
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 20f4206379260e3ca02c8ee57bc3da9b0c7d09da
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 4 19:57:06 2008 -0300

    V4L/DVB (7842): tda18271: fix error handling in tda18271c2_rf_tracking_filters_correction
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 31940e3966b6cf3bb3e535ffa1cb97b16edd555b
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 4 19:37:27 2008 -0300

    V4L/DVB (7841): tda18271: fix error handling in tda18271_channel_configuration
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 9c41d456e2936ea3aafa07d431c5963799f9659e
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 4 18:18:48 2008 -0300

    V4L/DVB (7840): tda18271: make tda18271_set_standby_mode less verbose for basic debug
    
    Only show debug from tda18271_set_standby_mode if DBG_ADV is set.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit c151c32fd7d8f5ca7dcd35430f2e625181c48d66
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 4 17:54:23 2008 -0300

    V4L/DVB (7839): tda18271: abort rf band calibration loop on errors
    
    Abort rf band calibration loop for the TDA18271HD/C2 if an error is detected.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 24124f784bfec447f5cb9e64ed337afb57f0fca5
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sat May 3 19:28:00 2008 -0300

    V4L/DVB (7838): tda18271: fix error handling in tda18271c2_rf_cal_init path
    
    fix error handling in tda18271c2_rf_cal_init immediate path
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit d35fccaffd095e79691cd07a49a36867cb275b72
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sat May 3 18:20:21 2008 -0300

    V4L/DVB (7837): tda18271: fix error handling in init and sleep paths
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit dc9d522a1358bfb87e9ed8718cc1e4d5141a5468
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun May 4 20:32:45 2008 -0300

    V4L/DVB (7836): cinergyT2 build fix
    
    x86.git testing found the following build bug in v2.6.26-rc1:
    
      drivers/built-in.o: In function `cinergyt2_probe':
      cinergyT2.c:(.text+0xb6117): undefined reference to `input_allocate_device'
      cinergyT2.c:(.text+0xb6230): undefined reference to `input_register_device'
      cinergyT2.c:(.text+0xb623d): undefined reference to `input_free_device'
    
    with the following config:
    
      http://redhat.com/~mingo/misc/config-Sun_May__4_22_06_54_CEST_2008.bad
    
    The reason for the bug is that the cinergyT2 driver depends on
    CONFIG_INPUT functionality, but if INPUT is modular it's still possible
    to build CONFIG_DVB_CINERGYT2=y - which leads to missing symbols.
    
    The solution is to make DVB_CINERGYT2 dependent on INPUT.
    
    [ This solves the build problem - i have not tested the driver on this card. ]
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 696b9562df15795facf9ffbd470983e776fa6c19
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon May 5 19:20:42 2008 -0300

    V4L/DVB (7835): multimedia/video: fix au0828 Kconfig
    
    Fix undefined references in au0828:
      depends on USB and select VIDEO_TVEEPROM
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 28dd15b4334c2ded53d7738160861aa16304b8fd
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sat May 3 21:23:51 2008 -0300

    V4L/DVB (7834): build fix for drivers/media/video/au0828
    
    x86.git testing found the following build failure in v2.6.26-rc1:
    
      MODPOST 424 modules
      ERROR: "tveeprom_hauppauge_analog" [drivers/media/video/au0828/au0828.ko] undefined!
      ERROR: "tveeprom_read" [drivers/media/video/au0828/au0828.ko] undefined!
    
    with this config:
    
      http://redhat.com/~mingo/misc/config-Sat_May__3_22_28_58_CEST_2008.bad
    
    this patch does what other video drivers do to utilize the
    VIDEO_TVEEPROM functionality (and this resolves the build problem) - but
    i have not checked it on real hardware and i have not checked whether
    the fix is complete.
    
    selections, so some items might still be missing - just not triggered
    with this specific config.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit f686d8c3b53c7b105330b5292ff5d44bb04e4971
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Mon May 5 21:08:28 2008 -0300

    V4L/DVB (7832): xc5000: MEDIA_TUNER_XC5000 must select FW_LOADER
    
    Fix the following build error:
    
    drivers/built-in.o: In function `xc_load_fw_and_init_tuner':
    xc5000.c:(.text+0x2dacd): undefined reference to `request_firmware'
    xc5000.c:(.text+0x2daf0): undefined reference to `release_firmware'
    xc5000.c:(.text+0x2db85): undefined reference to `release_firmware'
    make[1]: *** [.tmp_vmlinux1] Error 1
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 71a35fe2a345eb3704e1f1b4da65451d3e2b8c2e
Author: Robert Schedel <r.schedel@yahoo.de>
Date:   Sat May 3 12:58:36 2008 -0300

    V4L/DVB (7830): dvb_ca_en50221: Fix High CPU load in 'top' due to budget_av slot polling
    
    This change addresses kernel bug #10459: In kernel 2.6.25 the
    budget_av driver polls for an CI slot in 100ms intervals (because no
    interrupt solution for budget_av cards is feasible due to HW reasons).
    If no CI/CAM is connected to the DVB card, polling times out only after 250ms.
    This periodic polling leads to high CPU load.
    
    The change increases the polling interval for empty slots from 100ms to 5s.
    Intervals for remaining slot states (invalid, in progress, ready) are unchanged,
    as they are either temporary conditions or no timeout should occur.
    
    Signed-off-by: Robert Schedel <r.schedel@yahoo.de>
    Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit fa146c6dceffa68fa12f8d0b797ab9753fa1c792
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Fri May 2 16:20:10 2008 -0300

    V4L/DVB (7829): cx23885: remove remaining references to dvb-pll
    
    The cx23885 driver used to use dvb-pll for LG-TDVS-H064F support on the
    FusionHDTV5 Express.  This has since been converted to use tuner-simple
    instead, once digital tuning support was added to tuner-simple.
    
    Since cx23885 no longer uses dvb-pll, remove the #include "dvb-pll.h",
    and the DVB_PLL Kconfig selection.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 36396c893272a577eafad40630a609ccd36d20ea
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Fri May 2 16:14:33 2008 -0300

    V4L/DVB (7828): cx23885: update model matrix for Hauppauge WinTV HVR-1200 & WinTV HVR-1700
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 3c3852cda6e0c557f5e0915b5451510c1acd64a2
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Fri May 2 16:12:44 2008 -0300

    V4L/DVB (7827): cx23885: add missing subsystem ID for Hauppauge HVR-1200 OEM
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 74ee05109c9d6ae2dfe1b462592d3854ddbf1f6a
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Thu May 1 18:02:30 2008 -0300

    V4L/DVB (7823): em28xx: add additional usb subids for Hauppauge HVR-950
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit ef69c8e88bafdeb896395fa5379a4b8c6a10bb08
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Thu May 1 02:17:24 2008 -0300

    V4L/DVB (7813): Fix compilation, when V4L1_COMPAT is disabled
    
    This driver uses some sysfs helper functions that are available only for legacy
    drivers. It also requires linux/mm.h.
    
    This patch fixes compiliation when not in compat mode.
    
    Thanks to Ingo Molnar for identifying this issue.
    
    Acked-by: Jaime Velasco Juan <jsagarribay@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit b7eccc404f399ab93ed128e51ca5d6e0e5115dd2
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date:   Wed Apr 30 09:21:33 2008 -0300

    V4L/DVB (7810): soc_camera: mt9v022 and mt9m001 depend on I2C
    
    Both mt9v022 and mt9m001 cameras are controlled over the I2C bus.
    Respectively, their drivers require I2C to be built successfully.
    Thanks to Ingo Molnar for reporting the build-breakage.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit b4edcc9083af9444b288ee9e14cab28b29dc3636
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Wed Apr 30 12:36:09 2008 -0300

    V4L/DVB (7808): cx23885: fix kbuild dependencies
    
    Thanks to Ingo Molnar for finding this.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 0590d91c413fb5144608d69f50710064360aeec8
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed Apr 30 18:14:36 2008 -0300

    V4L/DVB (7807): cx88: Fix error handling, when dvb_attach() fails
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 6430a5a368208ae6c4bcd13e1f06460c96af66be
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed Apr 30 18:13:46 2008 -0300

    V4L/DVB (7806): em28xx: dvb_unregister_frontend() shouldn't be called, if not registered yet
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit f50090fc947e82464b4a033c9eff1898cb0676b5
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed Apr 30 18:13:05 2008 -0300

    V4L/DVB (7805): saa7134: dvb_unregister_frontend() shouldn't be called, if not registered yet
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit b538d28c2e326ed226096408dce4d9469d7ffa39
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed Apr 30 15:45:00 2008 -0300

    V4L/DVB (7804): tea5767: Fix error logic
    
    As pointed by Andrew Morton, the error testing were wrong. After reviewing
    tea5767, it were returning a positive value for errors.
    
    So, the double errors were cancelling each other.
    
    This patch fix it properly. It also considers any positive value as ok, on
    tuner-core.
    
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 09fee5f8211fc0a586187c4a0db7f5f42a4e333f
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed Apr 30 15:29:57 2008 -0300

    V4L/DVB (7802): tuner: Failures at tuner_attach were producing OOPS
    
    As reported by Mike Galbraith <efault@gmx.de>:
    
    [   13.666587] TUNER: Unable to find symbol tda829x_probe()
    [   13.674638] tuner' 1-004b: chip found @ 0x96 (saa7133[0])
    [   13.691175] DVB: Unable to find symbol tda9887_attach()
    [   13.698968] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
    [   13.709509] IP: [<ffffffff80302934>] strlcpy+0x11/0x36
    [   13.711135] PGD be167067 PUD be140067 PMD 0
    [   13.711137] Oops: 0000 [1] SMP
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit d557dab5de82edfe5bab9a1964dfc5cf2b2b6833
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Wed Apr 30 15:27:55 2008 -0300

    V4L/DVB (7801): saa7134: detach frontend, if tuner or Diseqc attach fails
    
    Before this patch, an error at tuner or diseqc were discarded by the driver.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit a1355e530173021099d0401f3294414382189dbd
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed Apr 30 11:40:17 2008 -0300

    V4L/DVB (7800): tuner_symbol_probe(): don't do symbol_put() if symbol_request() failed
    
    Because it goes BUG.
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 4ef7e3e90f56c74b2a17e12d49ed35c3767d66c2
Merge: 9604006... 1f465f4...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 12:33:56 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: user_regset_view table fix for ia32 on 64-bit
      x86: arch/x86/mm/pat.c - fix warning
      x86: fix csum_partial() export
      x86: early_init_centaur(): use set_cpu_cap()
      x86: fix app crashes after SMP resume
      x86: wakeup.lds.S - section ordering fix
      x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
      x86/pci: fix broken ISA DMA

commit a58e58fafdff4c25949221e46132e86f709d0b79
Author: Steve Wise <swise@opengridcomputing.com>
Date:   Tue May 13 11:52:55 2008 -0700

    RDMA/cxgb3: Wrap the software send queue pointer as needed on flush
    
    cxio_flush_sq() was failing to wrap around the software send queue
    causing garbage completion entries on a flush operation.
    
    Signed-off-by: Steve Wise <swise@opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit f018c7e177a50390f6fcb137f1a28a6027d8ba50
Author: Roland Dreier <rolandd@cisco.com>
Date:   Tue May 13 11:51:23 2008 -0700

    IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long
    
    Andrew Morton <akpm@linux-foundation.org> pointed out that bitops
    should take an unsigned long * arg.  However, the ipath driver was
    doing bitops on struct ipath_devdata.ipath_sdma_status, which is u64.
    Change this member to unsigned long to avoid tons of warnings when x86
    fixes the bitops to take unsigned long * instead of void *.
    
    Also, change the IPATH_SDMA_RUNNING and IPATH_SDMA_SHUTDOWN bit
    numbers to 30 and 31 (instead of 62 and 63) so that we're not setting
    another booby trap for someone who tries to make ipath work on a
    32-bit architecture.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 40d97692fbfe52ef68fa771d8121394b2210fd67
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Tue May 13 11:45:32 2008 -0700

    IB/ipath: Make ipath_portdata work with struct pid * not pid_t
    
    The official reason is "with the presence of pid namespaces in the
    kernel using pid_t-s inside one is no longer safe."
    
    But the reason I fix this right now is the following:
    
    About a month ago (when 2.6.25 was not yet released) there still was a
    one last caller of a to-be-deprecated-soon function find_pid() - the
    kill_proc() function, which in turn was only used by nfs callback
    code.
    
    During the last merge window, this last caller was finally eliminated
    by some NFS patch(es) and I was about to finally kill this kill_proc()
    and find_pid(), but found, that I was late and the kill_proc is now
    called from the ipath driver since commit 58411d1c ("IB/ipath: Head of
    Line blocking vs forward progress of user apps").
    
    So here's a patch that fixes this code to use struct pid * and (!)
    the kill_pid routine.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 74116f580b7279543340dd716a2af642f5c1c2c7
Author: Ralph Campbell <ralph.campbell@qlogic.com>
Date:   Tue May 13 11:42:20 2008 -0700

    IB/ipath: Fix RDMA read response sequence checking
    
    If an out of sequence RDMA read response middle or last packet is
    received, we should only resend the RDMA read request on the first
    out of sequence packet and drop subsequent out of sequence packets
    otherwise, we get "too many retries".
    
    Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit e509be898d8937634437caa474b57ac12795e5bc
Author: Ralph Campbell <ralph.campbell@qlogic.com>
Date:   Tue May 13 11:41:29 2008 -0700

    IB/ipath: Fix many locking issues when switching to error state
    
    The send DMA hardware queue voided a number of prior assumptions about
    when a send is complete which led to completions being generated out of
    order.  There were also a number of locking issues when switching the QP
    to the error or reset states, and we implement the IB_QPS_SQD state.
    
    Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 53dc1ca194c062aa9771e194047f27ec1ca592df
Author: Ralph Campbell <ralph.campbell@qlogic.com>
Date:   Tue May 13 11:40:25 2008 -0700

    IB/ipath: Fix RC and UC error handling
    
    When errors are detected in RC, the QP should transition to the
    IB_QPS_ERR state, not the IB_QPS_SQE state. Also, when the error is on
    the responder side, the receive work completion error was incorrect
    (remote vs. local).
    
    Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit dd37818dbdf8e51d0288c0197c351c005ffcdbdb
Author: Roland Dreier <rolandd@cisco.com>
Date:   Tue May 13 11:27:25 2008 -0700

    RDMA/nes: Fix up nes_lro_max_aggr module parameter
    
    Fix some bugs with the max_aggr module parameter added with LRO support:
    
     - The module parameter value ignored and not actually used to set
       lro_mgr.max_aggr.
     - MODULE_PARM_DESC had a typo "_mro_" instead of "_lro_" so it didn't
       end up describing the actual module parameter.
     - The nes_lro_max_aggr variable was declared as unsigned, but the
       module_param line said "int" instead of "uint" for the type.
     - The default value for the parameter was stuck in the permissions
       field of module_param, which led to nonsensical permissions for the
       file under /sys/module/iw_nes/param.
     - The parameter was used in only one file but defined in another, which
       led to the variable being global for no good reason.  Move everything
       related to the parameter to the file nes_hw.c where it is actually
       used.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 9604006d283fb67dda5ee9e0e15b7cc6c62e1557
Merge: 25c55d9... af5741c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 11:24:51 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] qla1280: Fix queue depth problem
      [SCSI] aha152x: Fix oops on module removal
      [SCSI] aha152x: fix init suspiciously returned 1, it should follow 0/-E convention
      [SCSI] libiscsi regression in 2.6.25: fix setting of recv timer
      [SCSI] libiscsi regression in 2.6.25: fix nop timer handling
      [SCSI] gdth: fix Error: Driver 'gdth' is already registered, aborting...
      [SCSI] gdth: fix timer handling

commit 25c55d97209090db1a5f601815433f085bd1af78
Merge: 5dc93cf... c4e5fad...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 10:48:35 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      ACPI/PCI: another multiple _OSC memory leak fix
      x86/PCI: X86_PAT & mprotect
      PCI: enable nv_msi_ht_cap_quirk for ALi bridges
      PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
      ACPI/PCI: handle multiple _OSC
      ACPI/PCI: handle multiple _OSC
      x86/PCI: fix broken ISA DMA
      PCI ACPI: fix uninitialized variable in __pci_osc_support_set

commit 1f465f4e475454b8bb590846c50a9d16e8046f3d
Author: Roland McGrath <roland@redhat.com>
Date:   Fri May 9 15:43:44 2008 -0700

    x86: user_regset_view table fix for ia32 on 64-bit
    
    The user_regset_view table for the 32-bit regsets on the 64-bit build had
    the wrong sizes for the FP regsets.  This bug had no user-visible effect
    (just on kernel modules using the user_regset interfaces and the like).
    But the fix is trivial and risk-free.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit afc85343807bc2c488b7372cd7547875dfe03fe5
Author: Pranith Kumar <bobby.prani@gmail.com>
Date:   Mon May 12 14:52:26 2008 +0530

    x86: arch/x86/mm/pat.c - fix warning
    
    fix this warning:
    
     arch/x86/mm/pat.c: In function `phys_mem_access_prot_allowed':
     arch/x86/mm/pat.c:558: warning: long long unsigned int format, long
     unsigned int arg (arg 6)
     arch/x86/mm/pat.c: In function `map_devmem':
     arch/x86/mm/pat.c:580: warning: long long unsigned int format, long
     unsigned int arg (arg 6)
    
    Signed-off-by: D Pranith Kumar <bobby.prani@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 89804c022fe32541f5dd40a69e48ff4678d9ad24
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue May 13 10:36:22 2008 +0200

    x86: fix csum_partial() export
    
    Fix this symbol export problem:
    
        Building modules, stage 2.
        MODPOST 193 modules
        ERROR: "csum_partial" [fs/reiserfs/reiserfs.ko] undefined!
        make[1]: *** [__modpost] Error 1
        make: *** [modules] Error 2
    
    This is due to a known weakness of symbol exports: if a symbol's
    only in-core user is an EXPORT_SYMBOL from a lib-y section, the
    symbol is not linked in.
    
    The solution is to move the export to x8664_ksyms_64.c - but the real
    solution would be to fix kbuild.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 8c45a4e4f2b9bed6b6c54aaafc89e906284ccdf2
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Mon May 12 19:31:20 2008 -0700

    x86: early_init_centaur(): use set_cpu_cap()
    
    arch/x86/kernel/setup_64.c:954: warning: passing argument 2 of 'set_bit' from incompatible pointer type
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 61165d7a035f6571c7576e7f51e7230157724c8d
Author: Hugh Dickins <hugh@veritas.com>
Date:   Tue May 13 14:26:57 2008 +0100

    x86: fix app crashes after SMP resume
    
    After resume on a 2cpu laptop, kernel builds collapse with a sed hang,
    sh or make segfault (often on 20295564), real-time signal to cc1 etc.
    
    Several hurdles to jump, but a manually-assisted bisect led to -rc1's
    d2bcbad5f3ad38a1c09861bca7e252dde7bb8259 x86: do not zap_low_mappings
    in __smp_prepare_cpus.  Though the low mappings were removed at bootup,
    they were left behind (with Global flags helping to keep them in TLB)
    after resume or cpu online, causing the crashes seen.
    
    Reinstate zap_low_mappings (with local __flush_tlb_all) for each cpu_up
    on x86_32.  This used to be serialized by smp_commenced_mask: that's now
    gone, but a low_mappings flag will do.  No need for native_smp_cpus_done
    to repeat the zap: let mem_init zap BSP's low mappings just like on UP.
    
    (In passing, fix error code from native_cpu_up: do_boot_cpu returns a
    variety of diagnostic values, Dprintk what it says but convert to -EIO.
    And save_pg_dir separately before zap_low_mappings: doesn't matter now,
    but zapping twice in succession wiped out resume's swsusp_pg_dir.)
    
    That worked well on the duo and one quad, but wouldn't boot 3rd or 4th
    cpu on P4 Xeon, oopsing just after unlock_ipi_call_lock.  The TLB flush
    IPI now being sent reveals a long-standing bug: the booting cpu has its
    APIC readied in smp_callin at the top of start_secondary, but isn't put
    into the cpu_online_map until just before that unlock_ipi_call_lock.
    
    So native_smp_call_function_mask to online cpus would send_IPI_allbutself,
    including the cpu just coming up, though it has been excluded from the
    count to wait for: by the time it handles the IPI, the call data on
    native_smp_call_function_mask's stack may well have been overwritten.
    
    So fall back to send_IPI_mask while cpu_online_map does not match
    cpu_callout_map: perhaps there's a better APICological fix to be
    made at the start_secondary end, but I wouldn't know that.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit af5741c6de4f4a1d8608b0f00867c77cb7123635
Author: Jeremy Higdon <jeremy@sgi.com>
Date:   Sun May 11 23:17:03 2008 -0700

    [SCSI] qla1280: Fix queue depth problem
    
    The qla1280 driver was ANDing the output value of mailbox register
    0 with (1 << target-number) to determine whether to enable queueing
    on the target in question.
    
    But mailbox register 0 has the status code for the mailbox command
    (in this case, Set Target Parameters).  Potential values are:
    /*
     * ISP mailbox command complete status codes
     */
    
    So clearly that is in error.  I can't think what the author of that
    line was looking for in a mailbox register, so I just eliminated the
    AND.  flag is used later in the function, and I think that the later
    usage was also wrong, though it was used to set values that aren't
    used.  Oh well, an overhaul of this driver is not what I want to do
    now -- just a bugfix.
    
    After the fix, I found that my disks were getting a queue depth of
    255, which is far too many.  Most SCSI disks are limited to 32 or
    64.  In any case, there's no point, queueing up a bunch of commands
    to the adapter that will just result in queue full or starve other
    targets from being issued commands due to running out of internal
    memory.  So I dropped default queue depth to 32 (from which 1 is
    subtracted elsewhere, giving net of 31).
    
    I tested with a Seagate ST336753LC, and results look good, so
    I'm satisfied with this patch.
    
    Signed-off-by: Jeremy Higdon <jeremy@sgi.com>
    Acked-by: Jes Sorensen <jes@sgi.com>
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit c4e5fadd2a6fc0da465dcde761877d9a87313b33
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 13 16:48:50 2008 +0900

    ACPI/PCI: another multiple _OSC memory leak fix
    
    The acpi_query_osc() function can be called for the ACPI object that
    doesn't have _OSC method. In this case, acpi_get_osc_data() would
    allocate a useless memory region. To avoid this, we need to check the
    existence of _OSC before calling acpi_get_osc_data() in acpi_query_osc().
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 77db9885646f8a88214ea482988d41f8f73630f4
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Fri May 9 13:05:19 2008 -0700

    x86/PCI: X86_PAT & mprotect
    
    Some versions of X used the mprotect workaround to change caching type from UC
    to WB, so that it can then use mtrr to program WC for that region [1].  Change
    the mmap of pci space through /sys or /proc interfaces from UC to UC_MINUS.
    With this change, X will not need to use mprotect workaround to get WC type
    since the MTRR mapping type will be honored.
    
    The bug in mprotect that clobbers PAT bits is fixed in a follow on patch. So,
    this X workaround will stop working as well.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 439a7733e8fcbaee39979c10246101565834d6b2
Author: Björn Krombholz <fox.box@gmail.com>
Date:   Mon May 12 00:24:27 2008 +0200

    PCI: enable nv_msi_ht_cap_quirk for ALi bridges
    
    This applies the NVidia MSI enabled flag for HT capable devices quirk
    to ALi bridges as well.
    
    As described in more detail in http://bugzilla.kernel.org/show_bug.cgi?id=10667
    this is required for my board which is using an nForce 3 250Gb chipset with an
    ALi M1695 northbridge.
    
    It fixes a regression introduced in 2.6.24 that made the internal NIC of the
    board unusable (MSI initialisation of the NIC but disabled MSI on the
    northbridge devices.
    
    Signed-off-by: Björn Krombholz <fox.box@gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit a7eb08c2a14f28cb652ea6ad1a8e2b8efc55fb9a
Author: mark gross <mgross@linux.intel.com>
Date:   Mon May 12 13:41:57 2008 -0700

    PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
    
    The following patch changes the intel-iommu.c code to use the TSC
    instead of jiffies for detecting bad DMAR functionality.  Some systems
    with bad bios's have been seen to hang in early boot spinning in the
    IOMMU_WAIT_IO macro.  This patch will replace the infinite loop with a call to
    panic.
    
    Signed-off-by: Mark Gross <mgross@linux.intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 34a65055e5e7304b3d6ad0f7542bf66308eae50a
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Mon May 12 22:55:45 2008 +0900

    ACPI/PCI: handle multiple _OSC
    
    The pci_osc_control_set() function can be called for the ACPI object
    that doesn't have _OSC method. In this case, acpi_get_osc_data() would
    allocate a useless memory region. To avoid this, we need to check the
    existence of _OSC before calling acpi_get_osc_data(). Here is a patch
    to fix this problem in pci_osc_control_set.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit a5d1c8798309a384c2776e5ff472f8ceb6d9065d
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Mon May 12 10:48:10 2008 +0800

    ACPI/PCI: handle multiple _OSC
    
    There is an IA64 system here which have two pci root bridges with _OSC.
    One _OSC disables SHPC control bit but the other not. Below patch makes
    _OSC data per-device instead of one global, otherwise linux takes both
    root bridges don't support SHPC.
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 4a367f3a9dbf2e7ffcee4702203479809236ee6e
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri May 9 08:06:55 2008 +0200

    x86/PCI: fix broken ISA DMA
    
    Rene Herman reported:
    
    > commit 8779f2fc3b84ebb6c5181fb13d702e9944c16069
    >
    > "x86: don't try to allocate from DMA zone at first"
    >
    > breaks all of ISA DMA. Or all of ALSA ISA DMA at least. All
    > ISA soundcards are silent following that commit -- no error
    > messages, everything appears fine, just silence.
    
    That patch is buggy. We had an implicit assumption that
    dev = NULL for ISA devices that require 24bit DMA.
    
    The recent work on x86 dma_alloc_coherent() breaks the ISA DMA buffer
    allocation, which is represented by "dev = NULL" and requires 24bit
    DMA implicitly.
    
    Bisected-by: Rene Herman <rene.herman@keyaccess.nl>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 21e2b0a5efb3a01de58e7cb630f2eb70894da352
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Thu May 8 14:37:25 2008 +0900

    PCI ACPI: fix uninitialized variable in __pci_osc_support_set
    
    Fix uninitialized variable in __pci_osc_support_set().
    
    If the ACPI namespace doesn't have any device object corresponding to
    the specified hid, 'retval' in __pci_osc_support_set() is not changed
    by the acpi_query_osc() callback. Since 'retval' is not initizlized in
    the current implementation, the contents of 'retval' is undefined in
    this case. This causes a mis-handling of ctrlset_buf[OSC_SUPPORT_TYPE]
    and will cause an unexpected result in the subsequent
    pci_osc_control_set() call as a result.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b
Merge: 43f14d8... 3c17279...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 09:49:06 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
      [ALSA] ASoC: build fix for snd_soc_info_bool_ext
      [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
      [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
      [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event

commit 43f14d856f013a4cc63da2c765617c665274338c
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon May 12 14:02:40 2008 -0700

    eCryptFS: fix imbalanced mutex locking
    
    Fix imbalanced calls for mutex lock/unlock on ecryptfs_daemon_hash_mux
    Revealed by Ingo Molnar: http://lkml.org/lkml/2008/5/7/260
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: Michael Halcrow <mhalcrow@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d850a2fac11e4dd45d1d3d493a5a071b06c58c99
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon May 12 14:02:39 2008 -0700

    vt/fbcon: fix background color on line feed
    
    Another addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b
    ("vt: fix background color on line feed").
    
    fbcon still was not doing the right thing (read: continued to do old
    behavior).  fbcon_clear() seems to clear the new line (e.g.  where your new
    prompt appears after doing echo -en "\e[42mfoo\n"), while scr_memsetw clears
    the previous one only (where "foo" appears).  So just temporarily set the
    video_erase_char to the scrl_erase_char so that fbcon_clear does the right
    thing.
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7fe3915a492503a9199af475a433b50258303806
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon May 12 14:02:38 2008 -0700

    vt/fbcon: update scrl_erase_char after 256/512-glyph font switch
    
    Addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b ("vt: fix
    background color on line feed").
    
    vc->vc_scrl_erase_char was not updated when fbcon switches between
    256- and 512-glyph fonts.
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9fb1f68d40d9dd99fdbf65349c9c6af760e19e6e
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Mon May 12 14:02:38 2008 -0700

    rtc: m41t80: include <linux/kernel.h> for printk()
    
    The driver uses printk(), but does not include <linux/kernel.h> -- add it.
    
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Alexander Bigga <ab@mycable.de>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 417607d05f41dbe2acccdb7a298a81d30ba1d22b
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Mon May 12 14:02:35 2008 -0700

    RTC/watchdog: M41T80: fix a potential use of unitialized data
    
    Watchdog handlers within the driver make use of "save_client" -- make sure it
    has been initalized before the handlers are registered.
    
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Alexander Bigga <ab@mycable.de>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6c82c4150910dedd449194cb6d286b80478f3542
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Mon May 12 14:02:34 2008 -0700

    drivers/char/synclink_gt.c: don't return an uninitialised local
    
    drivers/char/synclink_gt.c: In function 'put_char':
    drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
    
    The compiler speaketh truth.
    
    Cc: Paul Fulghum <paulkf@microgate.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f36f21ecca9ee688301174e5f2e0827827a7a7ff
Author: Jean Delvare <khali@linux-fr.org>
Date:   Mon May 12 14:02:33 2008 -0700

    Fix misuses of bdevname()
    
    bdevname() fills the buffer that it is given as a parameter, so calling
    strcpy() or snprintf() on the returned value is redundant (and probably not
    guaranteed to work - I don't think strcpy and snprintf support overlapping
    buffers.)
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Stephen Tweedie <sct@redhat.com>
    Cc: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 78bb6cb9a890d3d50ca3b02fce9223d3e734ab9b
Author: Miklos Szeredi <mszeredi@suse.cz>
Date:   Mon May 12 14:02:32 2008 -0700

    fuse: add flag to turn on big writes
    
    Prior to 2.6.26 fuse only supported single page write requests.  In theory all
    fuse filesystem should be able support bigger than 4k writes, as there's
    nothing in the API to prevent it.  Unfortunately there's a known case in
    NTFS-3G where big writes cause filesystem corruption.  There could also be
    other filesystems, where the lack of testing with big write requests would
    result in bugs.
    
    To prevent such problems on a kernel upgrade, disable big writes by default,
    but let filesystems set a flag to turn it on.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Szabolcs Szakacsits <szaka@ntfs-3g.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0f146a764ff08c4c210c04239c5e6784b4b77485
Author: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Date:   Mon May 12 14:02:31 2008 -0700

    cgroups: fix documentation
    
    Correct the cgroups documentation to reflect the correct file names.
    
    Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
    Cc: Sudhir Kumar <skumar@linux.vnet.ibm.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Paul Menage <menage@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4cd1a8fc3d3cd740416b14ece2693dbb5d065eaf
Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date:   Mon May 12 14:02:31 2008 -0700

    memcg: fix possible panic when CONFIG_MM_OWNER=y
    
    When mm destruction happens, we should pass mm_update_next_owner() the old mm.
     But unfortunately new mm is passed in exec_mmap().
    
    Thus, kernel panic is possible when a multi-threaded process uses exec().
    
    Also, the owner member comment description is wrong.  mm->owner does not
    necessarily point to the thread group leader.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Cc: "Paul Menage" <menage@google.com>
    Cc: "KAMEZAWA Hiroyuki" <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c9bfcb3151040cff6714542d1da04ccd7e2d3efc
Author: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date:   Mon May 12 14:02:30 2008 -0700

    spi_mpc83xx: much improved driver
    
    The current driver may cause glitches on SPI CLK line since one must disable
    the SPI controller before changing any HW settings.  Fix this by implementing
    a local spi_transfer function that won't change speed and/or word size while
    CS is active.
    
    While doing that heavy lifting a few other issues were addressed too:
     - Make word size 16 and 32 work too.
     - Honor bits_per_word and speed_hz in spi transaction.
     - Optimize the common path.
    
    This also stops using the "bitbang" framework (except for a few constants).
    
    [Roel Kluin <12o3l@tiscali.nl>: "irq" needs to be signed]
    Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f4ed0deae8983591264d0e194e168ef65f4775f5
Author: Paul Jackson <pj@sgi.com>
Date:   Mon May 12 14:02:29 2008 -0700

    cpumask: remove bitmap_scnprintf_len and cpumask_scnprintf_len
    
    They aren't used.  They were briefly used as part of some other patches to
    provide an alternative format for displaying some /proc and /sys cpumasks.
    They probably should have been removed when those other patches were dropped,
    in favor of a different solution.
    
    Signed-off-by: Paul Jackson <pj@sgi.com>
    Cc: "Mike Travis" <travis@sgi.com>
    Cc: "Bert Wesarg" <bert.wesarg@googlemail.com>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 53c78dd1718b99dc365ff8a2244d7d4504b070a5
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Mon May 12 14:02:28 2008 -0700

    fbdev: do not let CONFIG_FB_DEFERRED_IO default to y
    
    CONFIG_FB_DEFERRED_IO can not be turned off, while it's already selected
    automatically by the drivers that need it.
    
    Although it's nice to have more compile-coverage, not being able to disable a
    rarely used feature is annoying.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit baf6332a238a680ef3add9cfb0729f136da886b8
Author: Nicolas Ferre <nicolas.ferre@atmel.com>
Date:   Mon May 12 14:02:25 2008 -0700

    atmel_lcdfb: fix pixclock divider calculation
    
    Fix divider calculation and allow CLKVAL = 0 (divisor 2)
    
    It was not possible to get the clock value 0 (divisor 2) because
    the test "<=0" force the BYPASS bit to be activated instead.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: Per Hedblom <per.hedblom@abem.se>
    Cc: Roel Kluin <12o3l@tiscali.nl>
    Cc: Jan Weber <jw022609@uni-greifswald.de>
    Cc: Andrew Victor <linux@maxim.org.za>
    Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 945185a69daa457c4c5e46e47f4afad7dcea734f
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Mon May 12 14:02:24 2008 -0700

    rtc: rtc_time_to_tm: use unsigned arithmetic
    
    The input argument to rtc_time_to_tm() is unsigned as well as are members of
    the output structure.  However signed arithmetic is used within for
    calculations leading to incorrect results for input values outside the signed
    positive range.  If this happens the time of day returned is out of range.
    
    Found the problem when fiddling with the RTC and the driver where year was set
    to an unexpectedly large value like 2070, e.g.:
    
    rtc0: setting system clock to 2070-01-01 1193046:71582832:26 UTC (3155760954)
    
    while it should be:
    
    rtc0: setting system clock to 2070-01-01 00:15:54 UTC (3155760954)
    
    Changing types to unsigned fixes the problem.
    
    [akpm@linux-foundation.org: remove old-fashioned `register' keyword]
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f38c84312748de9d04562c12af57080c6901f931
Author: Greg Ungerer <gerg@snapgear.com>
Date:   Mon May 12 14:02:23 2008 -0700

    m68knommu: missing sections for linker script
    
    Include the missing kcrctab and kcrctab_unused sections into the m68knommu
    linker script.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e662e1cfd434aa234b72fbc781f1d70211cb785b
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon May 12 14:02:22 2008 -0700

    init: don't lose initcall return values
    
    There is an ability to lose an initcall return value if it happened with irq
    disabled or imbalanced preemption (and if we debug initcall).
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 67d7671036e6cae24ded112e079926d55ffe9580
Author: Jordan Crouse <jordan.crouse@amd.com>
Date:   Mon May 12 14:02:22 2008 -0700

    Update Geode mailing list in MAINTAINERS
    
    Update the Geode list location in the MAINTAINERS file.
    
    Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 706322496b3a58af3cf258db2b553d6933656eef
Author: Eric Sesterhenn <snakebyte@gmx.de>
Date:   Mon May 12 14:02:21 2008 -0700

    Fix hfsplus oops on image without extents
    
    Fix an oops with a corrupted hfs+ image.
    
    See http://bugzilla.kernel.org/show_bug.cgi?id=10548 for details.
    
    Problem is that we call hfs_btree_open() from hfsplus_fill_super() to set
    HFSPLUS_SB(sb).[ext_tree|cat_tree] Both trees are still NULL at this moment.
    If hfs_btree_open() fails for any reason it calls iput() on the page, which
    gets to hfsplus_releasepage() which tries to access HFSPLUS_SB(sb).* which is
    still NULL and oopses while dereferencing it.
    
    [akpm@linux-foundation.org: build fix]
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4413a0f637df4e59b934909ac388a21cfdd90e69
Author: Mel Gorman <mel@csn.ul.ie>
Date:   Mon May 12 14:02:19 2008 -0700

    parisc: fix DISCONTIGMEM compile breakage
    
    PA-RISC to aid debugging prints out the zonelists setup by the system.  A
    bad call to node_zonelist() breaks at compile-time.  This patch fixes it.
    
    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Cc: Christoph Lameter <clameter@sgi.com>
    Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Grant Grundler <grundler@parisc-linux.org>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f2a5f24a279a21229e8c42198e21e2c8ce289129
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date:   Mon May 12 14:02:18 2008 -0700

    PNP: set IRQ index in sysfs "set irq" interface
    
    We have to set the ISAPNP register index when setting an IRQ via the sysfs
    interface.  We already do it for IO, MEM, and DMA resources; I just missed the
    IRQ one.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Len Brown <lenb@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 460817b9d45be7b2a50e1e24eb91b4aa0c435a09
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Mon May 12 14:02:17 2008 -0700

    mn10300: replace deprecated "TOPDIR" with newer "srctree"
    
    This would appear to be the last reference to TOPDIR in the entire tree, after
    which i'm guessing that variable can be dropped.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Acked-by: David Howells <dhowells@redhat.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7a6278e5e4bce72ace681ae3cf48209fb63a5420
Author: Julia Lawall <julia@diku.dk>
Date:   Mon May 12 14:02:16 2008 -0700

    drivers/video/pnx4008: eliminate double free
    
    The function framebuffer_release just calls kfree, so calling kfree
    subsequently on the same argument represents a double free.  The comments with
    the definition of framebuffer_release in drivers/video/fbsysfs.c suggest that
    a more elaborate definition of this function is planned, such that the
    splitting up of framebuffer_release and kfree as done in the second instance
    might someday make sense, but it does not make sense now.
    
    This was found using the following semantic match.
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E;
    @@
    
    * kfree(E);
    ...
    * framebuffer_release(E);
    
    @@
    expression E;
    @@
    
    * framebuffer_release(E);
    ...
    * kfree(E);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Cc: Vitaly Wool <vitalywool@gmail.com>
    Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: Grigory Tolstolytkin <gtolstolytkin@ru.mvista.com>
    Cc: Antonino Daplas <adaplas@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5aecd559871d23a3cc297e544c9d63f0b8441cf4
Author: Denis Cheng <crquan@gmail.com>
Date:   Mon May 12 14:02:14 2008 -0700

    mm/pdflush.c: merge the same code in two path
    
    Signed-off-by: Denis Cheng <crquan@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 241937b863c8a3ef10511712f53285f41ab05308
Author: Darrick J. Wong <djwong@us.ibm.com>
Date:   Mon May 12 14:02:13 2008 -0700

    adt7473: minor documentation update
    
    Add a sentence about when fan speed increases to maximum.
    
    Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 289f8e27ed435dcbefad132def06f4e84351e94f
Author: Serge E. Hallyn <serue@us.ibm.com>
Date:   Mon May 12 14:02:13 2008 -0700

    capabilities: add bounding set to /proc/self/status
    
    There is currently no way to query the bounding set of another task.  As there
    appears to be no security reason not to, and as Michael Kerrisk points out the
    following valid reasons to do so exist:
    
    * consistency (I can see all of the other per-thread/process sets in
      /proc/.../status)
    
    * debugging -- I could imagine that it would make the job of debugging an
      application that uses capabilities a little simpler.
    
    this patch adds the bounding set to /proc/self/status right after the
    effective set.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
    Acked-by: Andrew G. Morgan <morgan@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c8894419acf5e56851de9741c5047bebd78acd1f
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Mon May 12 14:02:12 2008 -0700

    md: fix raid5 'repair' operations
    
    commit bd2ab67030e9116f1e4aae1289220255412b37fd "md: close a livelock window
    in handle_parity_checks5" introduced a bug in handling 'repair' operations.
    After a repair operation completes we clear the state bits tracking this
    operation.  However, they are cleared too early and this results in the code
    deciding to re-run the parity check operation.  Since we have done the repair
    in memory the second check does not find a mismatch and thus does not do a
    writeback.
    
    Test results:
    $ echo repair > /sys/block/md0/md/sync_action
    $ cat /sys/block/md0/md/mismatch_cnt
    51072
    $ echo repair > /sys/block/md0/md/sync_action
    $ cat /sys/block/md0/md/mismatch_cnt
    0
    
    (also fix incorrect indentation)
    
    Cc: <stable@kernel.org>
    Tested-by: George Spelvin <linux@horizon.com>
    Acked-by: NeilBrown <neilb@suse.de>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3f275ea3086054205795972b8e87f2046fd3de98
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Mon May 12 14:02:11 2008 -0700

    tridentfb: improve clock setting accuracy
    
    Improve clock calculation precision (to kHz from MHz) and removes parameter
    field vclk from the tridentfb_par structure.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6fb488239cd8750cc818197d6c346409c0e8d330
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Mon May 12 14:02:09 2008 -0700

    tridentfb: remove misplaced enable_mmio()
    
    Remove redundant enable_mmio() call as the mmio mode is enabled in the probe
    function earlier.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 55654be9e11461484141d8dff0715efa0d7a945a
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Mon May 12 14:02:08 2008 -0700

    mmc: make one-bit signed bitfields unsigned
    
    Otherwise it can only take the values 0/-1 which doesn't seem to
    have been intended.
    
    drivers/mmc/host/sdhci.h:190:20: error: dubious one-bit signed bitfield
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Acked-by: Pierre Ossman <drzeus-list@drzeus.cx>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9377abd026bf9bde7db90dac09170034bf6d1cbf
Author: Jan Kara <jack@suse.cz>
Date:   Mon May 12 14:02:08 2008 -0700

    quota: don't call sync_fs() from vfs_quota_off() when there's no quota turn off
    
    Sometimes, vfs_quota_off() is called on a partially set up super block (for
    example when fill_super() fails for some reason).  In such cases we cannot
    call ->sync_fs() because it can Oops because of not properly filled in super
    block.  So in case we find there's not quota to turn off, we just skip
    everything and return which fixes the above problem.
    
    [akpm@linux-foundation.org: fxi tpyo]
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bb45d64224e5cafe8c8e0d18a20da998e5a7dc93
Author: Christoph Hellwig <hch@lst.de>
Date:   Mon May 12 14:02:06 2008 -0700

    ufs: remove unneeded ufs_put_inode prototype
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Evgeniy Dushistov <dushistov@mail.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b5be11329f8cb2cc1a4c3b33b6b8d096c6012895
Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date:   Mon May 12 14:02:06 2008 -0700

    make vmstat cpu-unplug safe
    
    When accessing cpu_online_map, we should prevent dynamic changing
    of cpu_online_map by get_online_cpus().
    
    Unfortunately, all_vm_events() doesn't do that.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Christoph Lameter <clameter@sgi.com>
    Cc: Gautham R Shenoy <ego@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 78f508ab07954d12896097ac07ab2fab443c7ca2
Author: Sebastian Siewior <bigeasy@linutronix.de>
Date:   Mon May 12 14:02:05 2008 -0700

    m68knommu: ColdFire add support for kernel preemption (missing chunk)
    
    As the subject says this patch adds the support for kernel preemption on
    m68knommu Coldfire.  I thing the same changes could be applied to 68360 &
    68328 but since I don't have the HW, I don't touch it.  Kconfig enables the
    preemption item only on coldfire.
    
    This is a missing chunk from Sebastian's original patch that I lost from the
    first submission.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8dc4e37362a5dc910d704d52ac6542bfd49ddc2f
Author: Miklos Szeredi <mszeredi@suse.cz>
Date:   Mon May 12 14:02:04 2008 -0700

    ecryptfs: clean up (un)lock_parent
    
    dget(dentry->d_parent) --> dget_parent(dentry)
    
    unlock_parent() is racy and unnecessary.  Replace single caller with
    unlock_dir().
    
    There are several other suspect uses of ->d_parent in ecryptfs...
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Michael Halcrow <mhalcrow@us.ibm.com>
    Cc: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 64d032ba434ad41586460811148f01511e5612f9
Author: Dean Nelson <dcn@sgi.com>
Date:   Mon May 12 14:02:03 2008 -0700

    drivers/misc/sgi-xp: replace partid_t with a short
    
    In preparation for supporting greater than 64 partitions replace partid_t by
    short in drivers/misc/sgi-xp.
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Acked-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 65c17b801e03e40acdca0cd34e8eb1b8a347b539
Author: Dean Nelson <dcn@sgi.com>
Date:   Mon May 12 14:02:02 2008 -0700

    drivers/misc/sgi-xp: clean up return values
    
    Make XP return values more generic to XP and not so tied to XPC by changing
    enum xpc_retval to xp_retval, along with changing return value prefixes from
    xpc to xp.  Also, cleanup a comment block that referenced some of these return
    values as well as the handling of BTE related return values.
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Acked-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0cf942d75a6acfa11a41f63330d8780901eda4af
Author: Eric BENARD <ebenard@free.fr>
Date:   Mon May 12 14:02:01 2008 -0700

    spi: pxa2xx_spi clock resume bugfix
    
    There is a typo in pxa2xx_spi.c, comment says "Enable the SSP clock", code
    says: clk_disable ...  so after resume, the SSP is dead.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Ned Forrester <nforrester@whoi.edu>
    Cc: Stephen Street <stephen@streetfiresound.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit fe2cc53ee013a4d4d0317d418e7019fe6533a5a8
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:02:00 2008 -0700

    uml: track and make up lost ticks
    
    Alarm delivery could be noticably late in the !CONFIG_NOHZ case because lost
    ticks weren't being taken into account.  This is now treated more carefully,
    with the time between ticks being calculated and the appropriate number of
    ticks delivered to the timekeeping system.
    
    Cc: Nix <nix@esperi.org.uk>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3d88958e01e71bb14a367db75f12f7a59c068f02
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:59 2008 -0700

    uml: style fixes in the random driver
    
    Give random.c a style workover while I'm changing it.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5d33e4d7fd9a52d2673e5c730eab81856e100a74
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:58 2008 -0700

    uml: random driver fixes
    
    The random driver would essentially hang if the host's /dev/random returned
    -EAGAIN.  There was a test of need_resched followed by a schedule inside the
    loop, but that didn't help and it's the wrong way to work anyway.
    
    The right way is to ask for an interrupt when there is input available from
    the host and handle it then rather than polling.
    
    Now, when the host's /dev/random returns -EAGAIN, the driver asks for a wakeup
    when there's randomness available again and sleeps.  The interrupt routine
    just wakes up whatever processes are sleeping on host_read_wait.
    
    There is an atomic_t, host_sleep_count, which counts the number of processes
    waiting for randomness.  When this reaches zero, the interrupt is disabled.
    
    An added complication is that async I/O notification was only recently added
    to /dev/random (by me), so essentially all hosts will lack it.  So, we use the
    sigio workaround here, which is to have a separate thread poll on the
    descriptor and send an interrupt when there is input on it.  This mechanism is
    activated when a process gets -EAGAIN (activating this multiple times is
    harmless, if a bit wasteful) and deactivated by the last process still
    waiting.
    
    The module name was changed from "random" to "hw_random" in order for udev to
    recognize it.
    
    The sigio workaround needed some changes.  sigio_broken was added for cases
    when we know that async notification doesn't work.  This is now called from
    maybe_sigio_broken, which deals with pts devices.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 60a2988aea701a6424809a5432bf068667aac177
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:57 2008 -0700

    uml: physical memory shouldn't include initial stack
    
    The top of physical memory should be below the initial process stack, not the
    top of the address space, at least for as long as the stack isn't known to the
    kernel VM system and appropriately reserved.
    
    Cc: "Christopher S. Aker" <caker@theshore.net>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a7dfa9403bf3b03899d5ef5d10b0c5c3f74b0682
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon May 12 14:01:56 2008 -0700

    uml: use PAGE_SIZE in linker scripts
    
    This patch includes page.h header into linker scripts that allow us to
    use PAGE_SIZE macro instead of numeric constant.
    
    To be able to include page.h into linker scripts page.h is needed for
    some modification - i.e.  we need to use __ASSEMBLY__ and _AC macro
    
    [jdike@linux.intel.com - fixed conflict with as-layout.h]
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6d0742426c9adc7465ef5c62a99a1d3e9696ea19
Author: Jiri Olsa <olsajiri@gmail.com>
Date:   Mon May 12 14:01:56 2008 -0700

    uml: use DIV_ROUND_UP
    
    I just saw similar patches in the janitor kernel's list, and spotted place it
    fits.
    
    Signed-off-by: Jiri Olsa <olsajiri@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 63b9871f6ee2607f3b44e0044e145574b3f08619
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Mon May 12 14:01:55 2008 -0700

    uml: fix CONFIG_RAW dependencies
    
    Add the BLOCK dependency for RAW_DRIVER, to match what's in
    drivers/char/Kconfig.  Also, while we're there, update the alleged
    obsolesence of RAW_DRIVER since it doesn't seem to be going away any
    time soon.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5563d722bfc73f27423fcb76240bfc1fb4284635
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:54 2008 -0700

    uml: use __SPIN_LOCK_UNLOCKED
    
    From: Robert P. J. Day <rpjday@crashcourse.ca>
    
    Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cfd28f6695d0fc047478480791a21bdd4967f98e
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:53 2008 -0700

    uml: fix bad NTP interaction with clock
    
    UML's supposed nanosecond clock interacts badly with NTP when NTP
    decides that the clock has drifted ahead and needs to be slowed down.
    Slowing down the clock is done by decrementing the cycle-to-nanosecond
    multiplier, which is 1.  Decrementing that gives you 0 and time is
    stopped.
    
    This is fixed by switching to a microsecond clock, with a multiplier
    of 1000.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 309e96cdf2f2c1a071102e8bdf828a3493e6e50a
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:52 2008 -0700

    uml: remove unused header
    
    From: Adrian Bunk <bunk@kernel.org>
    
    This patch removes the unused and broken (the normal asm/keyboard.h
    files no longer exists) include/asm-um/keyboard.h
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 43f5b3085fdd27c4edf535d938b2cb0ccead4f75
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:52 2008 -0700

    uml: fix build when SLOB is enabled
    
    Reintroduce uml_kmalloc for the benefit of UML libc code.  The
    previous tactic of declaring __kmalloc so it could be called directly
    from the libc side of the house turned out to be getting too intimate
    with slab, and it doesn't work with slob.
    
    So, the uml_kmalloc wrapper is back.  It calls kmalloc or whatever
    that translates into, and libc code calls it.
    
    kfree is left alone since that still works, leaving a somewhat
    inconsistent API.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 484f1e2c1ea58c6a4352313f7ee4edd4b52deecd
Author: Johann Felix Soden <johfel@users.sourceforge.net>
Date:   Mon May 12 14:01:51 2008 -0700

    uml: fix errno return
    
    Error returns are negative.
    
    Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 47906dd9e63ba1a8cb188e9e786c5928674fbbd3
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:50 2008 -0700

    uml: tidy ptrace interface
    
    Tidy the ptrace interface code.  Removed a bunch of unused macros.
    Started converting register sets from arrays of longs to structures.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 46d7b522ebf486edbd096965d534cc6465e9e309
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:50 2008 -0700

    uml: move hppfs_kern.c to hppfs.c
    
    There's no reason for the _kern in hppfs_kern.c, so move it to hppfs.c.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a0612b1f0b3d851458dafe5886e33d58c1967440
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:49 2008 -0700

    uml: hppfs fixes
    
    hppfs tidying and fixes noticed during hch's get_inode work -
          style fixes
          a copy_to_user got its return value checked
          hppfs_write no longer fiddles file->f_pos because it gets and
    returns pos in its arguments
          hppfs_delete_inode dputs the underlyng procfs dentry stored in
    its private data and mntputs the vfsmnt stashed in s_fs_info
          hppfs_put_super no longer needs to mntput the s_fs_info, so it
    no longer needs to exist
          hppfs_readlink and hppfs_follow_link were doing a bunch of stuff
    with a struct file which they didn't use
          there is now a ->permission which calls generic_permission
          get_inode was always returning 0 for some reason - it now
    returns an inode if nothing bad happened
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 96cee3044dca2e6510ca7cc276d1eac34a1cfd51
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:48 2008 -0700

    uml: style fixes
    
    A few random style fixes.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 53c258787427ea43ebfa76fefa6534cae507e521
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:47 2008 -0700

    uml: redo host capability detection and disabling
    
    Redo how host capabilities are recorded at startup and disabled on the
    command line.
    
    There are now explicit variables saying what's been disabled by the
    command line rather than the implicitness of the have_* variable being
    zero.  The capability variables now start at zero and are set to one
    as their capabilities are found to be present on the host.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3c17279137bf8318438510b48229d4236f773da4
Author: Jarkko Nikula <jarkko.nikula@nokia.com>
Date:   Tue May 13 16:02:04 2008 +0200

    [ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
    
    Fix this typo and avoid similar errors by using ARRAY_SIZE macro.
    
    Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 392abe9cb36f04ccdda9c96938077b0d43f2b50b
Author: Philipp Zabel <philipp.zabel@gmail.com>
Date:   Tue May 13 14:03:40 2008 +0200

    [ALSA] ASoC: build fix for snd_soc_info_bool_ext
    
    I suspect that snd_ctl_boolean_mono should have been
    snd_ctl_boolean_mono_info instead. This fixes the build for magician.
    
    Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 5b006137f47622dbd4a5aa2ba4010202cbc31667
Author: Jarkko Nikula <jarkko.nikula@nokia.com>
Date:   Fri May 9 15:05:41 2008 +0200

    [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
    
    There is no endpoint called MONOLOUT but MONO_LOUT.
    
    Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 3a3bd960a0b7bb26604b1270a8b4cafdc5883040
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Fri May 9 13:43:55 2008 +0200

    [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
    
    This patch fixes following bug caught with PREEMPT enabled:
    
    root@b1:~# cat /dev/dsp > /dev/null
    BUG: scheduling while atomic: cat/965/0x00000003
    Call Trace:
    [df165ce0] [c0008e84] show_stack+0x4c/0x1ac (unreliable)
    [df165d20] [c001c18c] __schedule_bug+0x64/0x78
    [df165d30] [c02b3344] schedule+0x2d8/0x334
    [df165d70] [c02b3674] schedule_timeout+0x64/0xe4
    [df165db0] [c002c05c] msleep+0x1c/0x34
    [df165dc0] [c01f2fe0] fsl_ssi_trigger+0x130/0x144
    [df165dd0] [c01ece54] soc_pcm_trigger+0x94/0xb8
    [df165df0] [c01da764] snd_pcm_do_start+0x48/0x60
    [df165e00] [c01da630] snd_pcm_action_single+0x4c/0xb4
    [df165e20] [c01e0f50] snd_pcm_lib_read1+0x2a0/0x2d4
    [df165e70] [c01ec274] snd_pcm_oss_read3+0xf0/0x13c
    [df165eb0] [c01ec2e4] snd_pcm_oss_read2+0x24/0x4c
    [df165ec0] [c01ec4ac] snd_pcm_oss_read+0x1a0/0x1f0
    [df165ef0] [c0076478] vfs_read+0xb4/0x108
    [df165f10] [c00768cc] sys_read+0x4c/0x90
    [df165f40] [c00117a4] ret_from_syscall+0x0/0x38
    
    Acked-by: Timur Tabi <timur@freescale.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit bf91141d3565b35fb2a44364bfb874a3be3c12b6
Author: maximilian attems <max@stro.at>
Date:   Fri May 9 13:43:09 2008 +0200

    [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event
    
    When the hardware wavetable synthesizer of an Creative SB Audigy or SB
    Live! card (with emu10k chip) receives the MIDI SOFT_PEADAL-press event
    (?? 67 127) the appropriate voice is attenuted. Unfortunately when the
    pedal is released (event ?? 67 0) the voice does not get it's original
    volume again.
    
    Boolean MIDI controls should interpret 0..63 as false and 64..127 as true.
    Thanks to Clemens Ladisch for review and correction.
    
    Original patch from "Uwe Kraeger" <uwe_debbug@arcor.de>
    Submitted to http://bugs.debian.org/474312
    
    Signed-off-by: maximilian attems <max@stro.at>
    Cc: uwe_debbug@arcor.de
    Cc: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 79d44516b4b178ffb6e2159c75584cfcfc097914
Author: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date:   Tue May 13 02:54:19 2008 -0700

    tcp FRTO: work-around inorder receivers
    
    If receiver consumes segments successfully only in-order, FRTO
    fallback to conventional recovery produces RTO loop because
    FRTO's forward transmissions will always get dropped and need to
    be resent, yet by default they're not marked as lost (which are
    the only segments we will retransmit in CA_Loss).
    
    Price to pay about this is occassionally unnecessarily
    retransmitting the forward transmission(s). SACK blocks help
    a bit to avoid this, so it's mainly a concern for NewReno case
    though SACK is not fully immune either.
    
    This change has a side-effect of fixing SACKFRTO problem where
    it didn't have snd_nxt of the RTO time available anymore when
    fallback become necessary (this problem would have only occured
    when RTO would occur for two or more segments and ECE arrives
    in step 3; no need to figure out how to fix that unless the
    TODO item of selective behavior is considered in future).
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Reported-by: Damon L. Chesser <damon@damtek.com>
    Tested-by: Damon L. Chesser <damon@damtek.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a1c1f281b84a751fdb5ff919da3b09df7297619f
Author: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date:   Tue May 13 02:53:26 2008 -0700

    tcp FRTO: Fix fallback to conventional recovery
    
    It seems that commit 009a2e3e4ec ("[TCP] FRTO: Improve
    interoperability with other undo_marker users") run into
    another land-mine which caused fallback to conventional
    recovery to break:
    
    1. Cumulative ACK arrives after FRTO retransmission
    2. tcp_try_to_open sees zero retrans_out, clears retrans_stamp
       which should be kept like in CA_Loss state it would be
    3. undo_marker change allowed tcp_packet_delayed to return
       true because of the cleared retrans_stamp once FRTO is
       terminated causing LossUndo to occur, which means all loss
       markings FRTO made are reverted.
    
    This means that the conventional recovery basically recovered
    one loss per RTT, which is not that efficient. It was quite
    unobvious that the undo_marker change broken something like
    this, I had a quite long session to track it down because of
    the non-intuitiviness of the bug (luckily I had a trivial
    reproducer at hand and I was also able to learn to use kprobes
    in the process as well :-)).
    
    This together with the NewReno+FRTO fix and FRTO in-order
    workaround this fixes Damon's problems, this and the first
    mentioned are enough to fix Bugzilla #10063.
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Reported-by: Damon L. Chesser <damon@damtek.com>
    Tested-by: Damon L. Chesser <damon@damtek.com>
    Tested-by: Sebastian Hyrwall <zibbe@cisko.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1dbd6608191cff854ab467e9880b7aeb2385ca39
Merge: 5aaca7a... c714a53...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue May 13 11:32:58 2008 +0200

    Merge branch 'linus' into x86/urgent

commit 47ac3199acb0676b58491b29418283f37a116952
Merge: 608961a... 9932459...
Author: David S. Miller <davem@davemloft.net>
Date:   Tue May 13 01:09:15 2008 -0700

    Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit 9a28dbf8af11d127bf1c644143e7882cb91515dd
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 22:45:15 2008 -0700

    sparc64: Use a TS_RESTORE_SIGMASK
    
    This mirrors x86 changeset 5a8da0ea82db6fa9737041381079fd16f25dcce2
    ("signals: x86 TS_RESTORE_SIGMASK") on sparc64.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 993245908ec35c071315479e20602577b7b5dde6
Author: Auke Kok <auke-jan.h.kok@intel.com>
Date:   Wed May 7 13:42:33 2008 -0700

    New maintainer for Intel ethernet adapters
    
    I'm handing over maintainership to Jeff Kirsher and moving on
    to other Linux/Open Source work within Intel. Good luck to Jeff ;)
    
    Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 8f5bf5f25cdf9270f33ed347c582a3a451d3c38a
Author: Ben Dooks <ben-linux@fluff.org>
Date:   Thu May 8 11:36:42 2008 +0100

    DM9000: Use delayed work to update MII PHY state
    
    Periodically check the MII PHY status to ensure that the
    network layer's link status is updated and the user informed
    of any changes.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 37d5dca6af6b62bbb2c63f46a06cb07d0cf4522b
Author: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Date:   Thu May 8 11:35:13 2008 +0100

    DM9000: Update and fix driver debugging messages
    
    There was a missing newline in a dev_dbg() message.  Values read
    from/written into PHY registers might be for interest too, so I added
    new dbg messages there.
    
    Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e21fd4f07dd0c2630c3db41f419e4c658d0dee2c
Author: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Date:   Thu May 8 11:33:03 2008 +0100

    DM9000: Add __devinit and __devexit attributes to probe and remove
    
    There were missing __dev* annotations for the dm9000_probe()
    and dm9000_drv_remove() functions.
    
    Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a300344ab9b77130310fc225fdc7677e129b1163
Author: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date:   Tue May 6 14:34:35 2008 -0700

    sky2: fix simple define thinko
    
    noticed while browsing code, apparent thinko.  compile tested only.
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    CC: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 3273c2e8c66a21ae1c53b0c730ee937c6efde7e2
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 13:36:19 2008 +0100

    [netdrvr] sfc: sfc: Add self-test support
    
    Add a set of self-tests accessible thorugh ethtool.
    Add hardware loopback and TX disable control code to support them.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 05e3ec04460180f48810cddc2f78e80a725657ad
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 13:00:39 2008 +0100

    [netdrvr] sfc: Increment rx_reset when reported as driver event
    
    An RX_RESET event can be reported either as a global or as a driver event.
    We were counting only global events.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 53269e94cdaca6e470c18099912de977a193e815
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:59:10 2008 +0100

    [netdrvr] sfc: Remove unused macro EFX_XAUI_RETRAIN_MAX
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e52eddaece487b0855f5974ee0a0a3a172043ba8
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:58:41 2008 +0100

    [netdrvr] sfc: Fix code formatting
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit d6742d4a6dfc362b5dbb3e759e6198c3dbb47dbc
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:58:13 2008 +0100

    [netdrvr] sfc: Remove kernel-doc comments for removed members of struct efx_nic
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 707d982700c4cde83913f23eb6430a5bb435122a
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:57:44 2008 +0100

    [netdrvr] sfc: Remove garbage from comment
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ba911a4d16fb2dd562f5595731fc96bc8c4929d7
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:56:57 2008 +0100

    [netdrvr] sfc: Removed bogus 'fall-thru' comments
    
    Fall-through is expected outside a switch statement.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 75f2d3eac93277fa022b2fbe51257e856575e757
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:55:13 2008 +0100

    [netdrvr] sfc: Add phy_flash_cfg module parameter and implementation
    
    The 10Xpress PHY supports flash upgrades through MDIO, but needs to be
    put in upgrade mode at power-up.  This adds a module parameter and other
    logic to support that.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit b9b39b625cf57cd0ea998717598b68963cbec3cb
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Wed May 7 12:51:12 2008 +0100

    [netdrvr] sfc: Add TSO support
    
    The SFC4000 controller does not have hardware support for TSO, and the
    core GSO code incurs a high cost in allocating and freeing skbs.  This
    TSO implementation uses lightweight packet header structures and is
    substantially faster.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 48cfb14f8b89d4d5b3df6c16f08b258686fb12ad
Author: Hannes Hering <hannes.hering@linux.vnet.ibm.com>
Date:   Wed May 7 14:43:36 2008 +0200

    ehea: Add DLPAR memory remove support
    
    The eHEA driver uses the recently modified walk_memory_resource for powerpc
    functionality to detect the memory layout. It further uses the memory hotplug
    notifiers to catch memory hotplug events.
    
    Signed-off-by: Hannes Hering <hering2@de.ibm.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit fb7b6ca2b6b7c23b52be143bdd5f55a23b9780c8
Author: Hannes Hering <hannes.hering@linux.vnet.ibm.com>
Date:   Wed May 7 14:43:20 2008 +0200

    ehea: Add dependency to Kconfig
    
    The new ehea memory hot plug implementation depends on MEMORY_HOTPLUG.
    
    Signed-off-by: Hannes Hering <hering2@de.ibm.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 3c82c30cd5963a4523a6ec5f32fc2d20a5bb672a
Author: Hannes Hering <hannes.hering@linux.vnet.ibm.com>
Date:   Wed May 7 14:43:01 2008 +0200

    memory: Introduce exports for memory notifiers
    
    This patch introduces two exports to allow modules to use memory notifiers.
    
    Signed-off-by: Hannes Hering <hering2@de.ibm.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ad5da7ab7be0a510ae69d533edf573d1ca6eec4b
Author: Andy Fleming <afleming@freescale.com>
Date:   Wed May 7 13:20:55 2008 -0500

    gianfar: Fix a bug where the pointer never moves for dma_unmap...
    
    The loop that unmaps all of the TX Buffer Descriptors never actually
    moves the txbd pointer, so we were just repeatedly unmapping the first one.
    
    Signed-off-by: Andy Fleming <afleming@freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 204e2f98c2d13f869b8541f3c57c7314f75cab11
Author: Divy Le Ray <divy@chelsio.com>
Date:   Tue May 6 19:26:01 2008 -0700

    cxgb3 - fix EEH
    
    Reset the chip when the PCI link goes down.
    Preserve the napi structure when a sge qset's resources are freed.
    Replay only HW initialization when the chip comes out of reset.
    
    Signed-off-by: Divy Le ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 48c4b6dbb7e246957e13302668acf7c77e4f8b3a
Author: Divy Le Ray <divy@chelsio.com>
Date:   Tue May 6 19:25:56 2008 -0700

    cxgb3 - fix port up/down error path
    
    Fix faiures path when ports are stopped and restarted
    in EEH recovery.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 014377a1df693ff30a9e8b69f0bbb0a38e601f75
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:20:47 2008 +0200

    myri10ge: fix the number of interrupt slots
    
    Fix a long-standing bug/misunderstanding between the
    driver and the firmware.  The size of the interrupt
    queue must be set to the number of rx slots (big + small),
    and it should never have been a tunable.
    Setting it too small results in chaos.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit fa0a90d96b08856203435b051dd1c155b58ccd0f
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:20:25 2008 +0200

    myri10ge: cleanup retrieving of firmware capabilities
    
    Add myri10ge_get_firmware_capabilities() to retrieve TSO6 and
    interrupt slots capabilities from the firmware.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit b53bef84c27e68efac9b608392acd1fc14cb6ce7
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:20:03 2008 +0200

    myri10ge: move data structures into a single slice
    
    To prepare and simplify multislice rx support, add a single slice
    structure and move some fields in there.
    No functional change yet.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit eca3fd83436853483837f010d9c3fefafa46a15c
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:19:29 2008 +0200

    myri10ge: fix potential infinite loop in enable_ecrc
    
    Fix another potential for an infinite loop while looking for the
    root port in myri10ge_enable_ecrc().
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 99f5f87eb689c5766fa2c101fe75310a7f9ba3cd
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:19:08 2008 +0200

    myri10ge: trivial formatting fix
    
    Add some blank lines to uniformize the code and match
    the upstream code.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit bd2db0cf2411ebc081d45bde1b7c6cf726b832f2
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:18:45 2008 +0200

    myri10ge: add barrier in myri10ge_send_cmd
    
    Add a barrier() in the usleep() loop in  myri10ge_send_cmd().
    Without the barrier, some mips machine never notices that the
    firmware has DMA'ed the response.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit c0bf8801535d45df3597839edf864e24f60a4188
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:18:24 2008 +0200

    myri10ge: report FIBER in ethtool for XFP based NIC
    
    Make ethtool report FIBER for XFP based NIC's port type.
    Don't bother to poke around and try to find out what is in
    the XFP cage, since Linux does not have separate media types
    for -SR -LR, etc.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit f8fd57c11159d89d0d9cd624eafad41c680e8f6e
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:17:37 2008 +0200

    myri10ge: properly align scratch buffers
    
    Properly align scratch buffers when making boot commands.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit d93ca2a453f8e5734359267866ab4f3341aa8749
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:17:16 2008 +0200

    myri10ge: increase and fix handoff timeout
    
    Increase the handoff timeout to 512ms so as to give the aeluros based
    NICs sufficient time to handoff without relying on the msleep() being
    sloppy, and accidentally sleeping way longer than the 20ms we specified
    in 20 separate 1ms sleeps.
    
    Fix typo in the handoff sleep delay, which made it additive, not
    exponential.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit d1ce3a0f1a07b48e16ebbc71886086779b52f630
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:16:53 2008 +0200

    myri10ge: fix module parameter descriptions
    
    Remove useless linebreaks at the end of MODULE_PARM_DESC
    and fix the description of myri10ge_lro_max_pkts.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 0f7229dde3f2b5373e26e7d7dd35012bd975e452
Author: Brice Goglin <brice@myri.com>
Date:   Fri May 9 02:16:19 2008 +0200

    myri10ge: update firmware headers
    
    Update myri10ge firmware headers.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e8f720fdec08daa669f46c8d76da0714f6872ccc
Author: Jay Cliburn <jacliburn@bellsouth.net>
Date:   Fri May 9 22:12:09 2008 -0500

    atl1: bump version number
    
    atl1-2.1.3.
    
    Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit bf455a2247c6abe7d0debfbf2974514b5144ed4d
Author: Jay Cliburn <jacliburn@bellsouth.net>
Date:   Fri May 9 22:12:08 2008 -0500

    atl1: add shutdown callback
    
    Add a shutdown callback that points to atl1_suspend().  This, along
    with a working suspend function, fixes wake-on-lan.
    
    Tested-by: Per Olofsson <pelle@dsv.su.se>
    Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 08e0f1dc8388b3e134c714672c59edc2a7059430
Author: Jay Cliburn <jacliburn@bellsouth.net>
Date:   Fri May 9 22:12:07 2008 -0500

    atl1: fix broken suspend and resume
    
    Fix atl1_suspend() and atl1_resume() so they actually work.  We'll use
    the suspend function for wake-on-lan in addition to just suspending.
    
    Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ff772b27e5f65c1a186e9f0741f0d00ef7002799
Author: Jay Cliburn <jacliburn@bellsouth.net>
Date:   Fri May 9 22:12:06 2008 -0500

    atl1: add PHY power save mode
    
    Using vendor-provided magic, add code to enter power save mode
    on the PHY.  We'll need this for suspend and wake-on-lan.
    
    Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 608961a5eca8d3c6bd07172febc27b5559408c5d
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 21:59:32 2008 -0700

    mac80211: Use skb_header_cloned() on TX path.
    
    When skb_header_cloned() returns false you can change the
    headers however you like.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f3994eceebf64cf356a82ffb2718ef538eb8d4f4
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Mon May 12 20:51:44 2008 -0700

    mac80211: assign needed_headroom/tailroom for netdevs
    
    This assigns the netdev's needed_headroom/tailroom members to take
    advantage of pre-allocated space for 802.11 headers.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Mon May 12 20:48:31 2008 -0700

    net: Allow netdevices to specify needed head/tailroom
    
    This patch adds needed_headroom/needed_tailroom members to struct
    net_device and updates many places that allocate sbks to use them. Not
    all of them can be converted though, and I'm sure I missed some (I
    mostly grepped for LL_RESERVED_SPACE)
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8388e3da34edb141362bb42811ee487dfec15525
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 20:17:33 2008 -0700

    net: Set LL_MAX_HEADER properly for wireless.
    
    Wireless networking, particularly with MESH enabled, has
    quite strong requirements for link-layer header space.
    
    Based upon some numbers and descriptions from Johannes Berg
    we use 96 (same as AX25) for plain wireless, and with
    mesh enabled we use 128.
    
    In the process, simplify the cpp conditional logic here by
    ordering the cases by those needing the most space down
    to those needing the least case.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f403ede70518c131ba8bebbacaf182927a58a315
Merge: 5dc474d... a4278e1...
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 19:36:33 2008 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit a4278e18e7e497b76781492d010035c3c36f7403
Author: Pavel Roskin <proski@gnu.org>
Date:   Mon May 12 09:02:24 2008 -0400

    mac80211: add missing newlines in printk()
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 6fc7431dc0775f21ad7a7a39c2ad0290291a56ea
Author: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Date:   Mon May 12 13:50:28 2008 +0900

    PS3: gelic: fix memory leak
    
    This fixes the bug that the I/O buffer is not freed at the driver removal.
    
    Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 36d16ae73becc5978fe22866e9ab66b509211afe
Author: Helmut Schaa <hschaa@suse.de>
Date:   Thu May 8 13:34:07 2008 +0200

    mac80211: fix association with some APs
    
    Some APs refuse association if the supported rates contained in the
    association request do not match its own supported rates. This patch
    introduces a new function which builds the intersection between the AP's
    supported rates and the client's supported rates to work around such
    problems. The same approach is already used in ipw2200 for example.
    
    Signed-off-by: Helmut Schaa <hschaa@suse.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit c0186078b78839a8bdb385fa07a816c2f348a49d
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date:   Thu May 8 11:34:05 2008 +0800

    iwlwifi: Fix frequency in rx_status fill
    
    This patch fixes a bug in RX path, the frequency was wrongly set in the
    ieee80211_rx_status. This bug led to an empty scan list in A band.
    
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit dbabad0c9c026dea3ba803cbd9d768cdffc68e32
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Thu May 8 01:43:59 2008 +0200

    zd1211rw: fix potential use-after-free bug
    
    zd_mac_tx_to_dev() could potentially free the skb, or hand it off
    to mac80211 which might free it. Hence, this code needs to get the
    usb pointer out of skb->cb before handing it off to that function.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 6d6936e2ea82ebcbdd12d489b7b5ccf430de52f1
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Tue May 6 18:51:31 2008 +0400

    Fix potential scheduling while atomic in mesh_path_add.
    
    Calling synchronize_rcu() under write-lock-ed pathtbl_resize_lock may
    result in this warning (and other side effects).
    
    It looks safe just dropping this lock before calling synchronize_rcu.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0eb03d5a14377eecf6ed0ebf3cc2c9f48c12c7c6
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Tue May 6 18:49:02 2008 +0400

    Fix not checked kmalloc() result.
    
    The new_node kmallocation is not checked for success, so add
    this check.
    
    BTW, it also happens under the read_lock.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f84e71a94cb5f88d86ab50c251e09379925b80b9
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Tue May 6 18:46:36 2008 +0400

    Fix GFP_KERNEL allocation under read lock.
    
    The mesh_path_add() read-locks the pathtbl_resize_lock and calls
    kmalloc with GFP_KERNEL mask.
    
    Fix it and move the endadd2 label lower. It should be _before_ the
    if() beyond, but it makes no sense for it being there, so I move it
    right after this if().
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 812714d741750038004da505074c9158e9dee270
Author: Patrick McHardy <kaber@trash.net>
Date:   Tue May 6 12:52:07 2008 +0200

    mac80211: mesh hwmp: fix kfree(skb)
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 69687a0b9934942e61bf8148c242adea87183a5b
Author: Luis Carlos Cobo <luisca@cozybit.com>
Date:   Mon May 5 12:29:42 2008 -0700

    mac80211: fix access to null skb
    
    Without this patch, if xmit_skb is null but net_ratelimit() returns 0 we would
    go to the else branch and access the null xmit_skb. Pointed out by Johannes
    Berg.
    
    Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ef269254772a0d2253c85cafe160e3f6528eb292
Author: Luis Carlos Cobo <luisca@cozybit.com>
Date:   Mon May 5 12:02:35 2008 -0700

    mac80211: fix incorrect mesh header length
    
    This should have been updated at the same time we were transitioning from 3 byte
    to 4 byte mesh sequence number. Pointed out by Johannes Berg.
    
    Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit df44205455773852a6af10a7c6ed768fe8a86b31
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Mon May 5 20:40:35 2008 +0200

    mac80211: Don't encrypt beacons
    
    mac80211 should set the IEEE80211_TX_CTL_DO_NOT_ENCRYPT flag in tx_control
    structure to inform drivers not to encrypt the beacon. Drivers that only check
    for that flag before accessing the hw_key field, will otherwise cause a NULL
    pointer dereference since that field is not configured for beacons.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b30cdfc517b06f5d3f7a5e90626931140b2caece
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Mon May 5 17:24:03 2008 +0200

    rt2x00: Clean up error handling of PCI queue DMA allocation.
    
    When, for some reason, the rt2x00pci module fails to allocate DMA memory for
    the queues, it tries to undo the complete initialization of the PCI device,
    including freeing of the irq. This results in the following error in dmesg, as
    the irq hadn't been requested yet:
    
    [  78.123456] Trying to free already-free IRQ 17
    
    Fix this by implementing proper error handling code, instead of just using the
    full uninitialization function.
    
    Signed-off-by: Gertjan van Wingerde <gwingerde@kpnplanet.nl>
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ed499983b88d138848ec9e4d104fd86a5ef0c183
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Mon May 5 17:23:47 2008 +0200

    rt2x00: Fix broken recover-on-error path
    
    During initialization the initialize() callback function
    in rt2x00pci and rt2x00usb will cleanup the mess they made.
    
    rt2x00lib shouldn't call uninitialize because the callback function already
    cleaned up _and_ the DEVICE_INITIALIZED isn't set which causes the
    rt2x00lib_uninitialize() to halt directly anyway. All that is required
    to be cleaned up by rt2x00lib is the queue, and that can be done by
    calling rt2x00queue_uninitialize() directly.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 78720897459a0ed3843c80e9bd9ef1b2f7ae5c8f
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Mon May 5 17:23:31 2008 +0200

    rt2x00: Don't use pskb_expand_head()
    
    rt2x00pci allocates DMA for descriptor and data,
    rt61pci doesn't use this for the beacon, but it can
    use the descriptor part as temporary buffer instead
    of using pskb_expand_head().
    Using this temporary buffer is obviously much better
    then reallocating the skb buffer...
    
    At the same time we can set the data length for the
    beacon queue at 0, to make sure no DMA is allocated for
    data (but just for the descriptor).
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 6243065d308ab566aa318a8adef853bc0418896d
Author: Zhu Yi <yi.zhu@intel.com>
Date:   Mon May 5 10:22:46 2008 +0800

    iwlwifi: fix compile error when CONFIG_MAC80211_DEBUGFS is not selected
    
    Make iwl4965_lq_sta->drv available even without CONFIG_MAC80211_DEBUGFS.
    
    Signed-off-by: Yi Zhu <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 78520cad4b222d81fa18f2dcfa52394d8d1722b0
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Sat May 3 01:04:47 2008 +0200

    mac80211: fix debugfs default key oops
    
    Under certain circumstances (in AP mode) the debugfs function
    that is supposed to add the default key symlink can encounter
    a NULL default_key pointer. This patch makes it handle that
    situtation gracefully.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d5251aea1539ec89dd567e75169c568b5243b6fa
Author: John W. Linville <linville@tuxdriver.com>
Date:   Fri May 2 09:56:34 2008 -0400

    wavelan: avoid index past end of array if DEBUG_SHOW_UNUSED is defined
    
    Reported by Daniel Marjamäki <danielm77@spray.se> here:
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=10588
    
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit bb55bdd512905f35f9d7dfe65d1f16014e1f9b2f
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Thu May 1 15:58:17 2008 -0700

    fix irq flags in mac80211 code
    
    A file in the net/mac80211 directory uses "int" for flags.  This can cause
    hard to find bugs on some architectures.  This patch converts the flags to use
    "long" instead.
    
    This bug was discovered by doing an allyesconfig make on the -rt kernel where
    checks are done to ensure all flags are of size sizeof(long).
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 85b442e378ac3413e269a70a0031727ef121bd2a
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date:   Tue Apr 22 14:03:32 2008 -0400

    prism54: fix regression with missing carrier in AP-mode
    
    This fixes a regression introduced by commit 7b463ced6 (prism54: set
    carrier flags correctly) which causes the device to come up without
    a carrier in AP-mode.
    
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit faa6cfde747ba6d37a0889cbe85881c80806d355
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 17:21:55 2008 -0700

    lmb: Make lmb debugging more useful.
    
    Having to muck with the build and set DEBUG just to
    get lmb_dump_all() to print things isn't very useful.
    
    So use pr_info() and use an early boot param
    "lmb=debug" so we can simply ask users to reboot
    with this option when we need some debugging from
    them.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4978db5bd964d90265f957f980ab2b0771ca2b9f
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 16:51:15 2008 -0700

    lmb: Fix inconsistent alignment of size argument.
    
    When allocating, if we will align up the size when making
    the reservation, we should also align the size for the
    check that the space is actually available.
    
    The simplest thing is to just aling the size up from
    the beginning, then we can use plain 'size' throughout.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 94d149c34cda933ff5096aca94bb23bf68602f4e
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 16:33:33 2008 -0700

    sparc: Fix mremap address range validation.
    
    Just like mmap, we need to validate address ranges regardless
    of MAP_FIXED.
    
    sparc{,64}_mmap_check()'s flag argument is unused, remove.
    
    Based upon a report and preliminary patch by
    Jan Lieskovsky <jlieskov@redhat.com>
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5dc474d6b3ba19df7d491d4eabd9fb7a0c1c2423
Author: Julia Lawall <julia@diku.dk>
Date:   Mon May 12 15:43:46 2008 -0700

    pppol2tp: Remove null pointer dereference.
    
    If session is NULL, it is not possible to access its name field.  So I
    have split apart the printing of the error message to drop the
    printing of the name field in this case.
    
    The macro PRINTK actually only evaluates its arguments starting with
    the third one if the bitwise conjunction of the first two is non-zero.
    Normally, this conjunction would only be non-zero if debugging mode
    were turned on, but when session is NULL, the first argument in both
    the old and new code is -1, and thus the bitwise conjunction is true.
    Perhaps a different strategy is desired, such as using tunnel->debug,
    which session->debug is initialized to, but tunnel can also be NULL,
    so this does not completely solve the problem.
    
    
    This problem was found using the following semantic match
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E, E1;
    identifier f;
    statement S1,S2,S3;
    @@
    
    * if (E == NULL)
    {
      ... when != if (E == NULL) S1 else S2
          when != E = E1
    * E->f
      ... when any
      return ...;
    }
    else S3
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c714a534d85576af21b06be605ca55cb2fb887ee
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 13:34:13 2008 -0700

    Make 'cond_resched()' nullification depend on PREEMPT_BKL
    
    Because it's not correct with a non-preemptable BKL and just causes
    PREEMPT kernels to have longer latencies than non-PREEMPT ones (which is
    obviously not the point of it at all).
    
    Of course, that config option actually got removed as an option earlier,
    so for now this basically disables it entirely, but if BKL preemption is
    ever resurrected it will be a meaningful optimization.  And in the
    meantime, it at least documents the intent of the code, while not doing
    the wrong thing.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 542dafadd81eb5826280f7714592930144ae3e1f
Merge: 9404ef0... e691b9d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 13:29:15 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] don't allow demultiplex thread to exit until kthread_stop is called
      [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir
      [CIFS]  add local struct inode pointer to cifs_setattr
      [CIFS] cifs_find_tcp_session cleanup

commit 5aaca7a7a5db157530d195c4b93c8fc4682f8a48
Merge: 8c6b0ef... 9404ef0...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon May 12 22:29:14 2008 +0200

    Merge branch 'linus' into x86/urgent

commit 8c6b0ef2ea1bb42cd72d987389297f66cd25790b
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Sun May 11 22:46:38 2008 +0400

    x86: wakeup.lds.S - section ordering fix
    
    To allow linker to catch sections overlapping we have to declare
    them in appropriate order.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit f8955ebe3ea85a9d3ff2685ee64386fd34434cf3
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sat May 10 09:01:48 2008 -0500

    x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
    
    The phys_cpu_present_map is an expected symbol in the SMP harness.
    Unfortunately, x86 recently moved this and a few others to
    kernel/setup.c where it doesn't quite work because voyager has to
    define its own.  Use CONFIG_X86_LOCAL_APIC to isolate these
    definitions and fix up another area in setup.c where CONFIG_X86_SMP
    should be used instead of CONFIG_SMP.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Cc: toralf.foerster@gmx.de
    Cc: Mike Travis <travis@sgi.com>
    Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 8965eb19386fdf5ccd0ef8b02593eb8560aa3416
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon May 12 15:43:30 2008 +0200

    x86/pci: fix broken ISA DMA
    
    Rene Herman reported:
    
    > commit 8779f2fc3b84ebb6c5181fb13d702e9944c16069
    >
    > "x86: don't try to allocate from DMA zone at first"
    >
    > breaks all of ISA DMA. Or all of ALSA ISA DMA at least. All
    > ISA soundcards are silent following that commit -- no error
    > messages, everything appears fine, just silence.
    
    That patch is buggy. We had an implicit assumption that
    dev = NULL for ISA devices that require 24bit DMA.
    
    The recent work on x86 dma_alloc_coherent() breaks the ISA DMA buffer
    allocation, which is represented by "dev = NULL" and requires 24bit
    DMA implicitly.
    
    Bisected-by: Rene Herman <rene.herman@keyaccess.nl>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Tested-by: Rene Herman <rene.herman@keyaccess.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 9404ef02974a5411687b6c1b8ef3984305620e02
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 10:14:22 2008 -0700

    Fix up 'need_resched()' definition
    
    We should not go through the task pointer to get at the thread info,
    since it's usually cheaper to just access the thread info directly.
    
    So don't make the code look up 'current', when we can just use the
    thread info accessor functions directly.  This generally avoids one
    level of indirection and tends to work better together with code that
    also looks at other thread flags (eg preempt_count).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2b753a1599a28612851a2908abdbf86802c989c5
Merge: 8d97b84... 2ccdcfe...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 09:07:56 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
      types: s390: fix #ifdef reversal in <asm-s390/types.h>

commit 8d97b84935b28ed8944d1be31859a3df7ebe93ae
Merge: 9f1a073... cb0e8b0...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 09:03:42 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits)
      [MIPS] Pb1000: bury the remnants of the PCI code
      [MIPS] Fix build failure in mips oprofile code
      [MIPS] fix warning message on SMP kernels
      [MIPS] markeins: build fix
      [MIPS] ELF handling - use SELFMAG instead of numeric constant
      [MIPS] Get rid of __ilog2
      [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
      [MIPS] XXS1500 code style cleanup
      [MIPS] MTX-1 code style cleanup
      [MIPS] Pb1200/DBAu1200 code style cleanup
      [MIPS] Pb1550 code style cleanup
      [MIPS] Pb1500 code style cleanup
      [MIPS] Pb1100 code style cleanup
      [MIPS] Pb1000 code style cleanup
      [MIPS] DBAu1xx0 code style cleanup
      [MIPS] Alchemy PCI code style cleanup
      [MIPS] Alchemy common code style cleanup
      [MIPS] Alchemy common headers style cleanup
      [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
      [MIPS] msp_hwbutton.c: minor irq handler cleanups
      ...

commit 2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029
Author: H. Peter Anvin <hpa@zytor.com>
Date:   Fri May 9 09:46:38 2008 -0700

    types: s390: fix #ifdef reversal in <asm-s390/types.h>
    
    The #ifdef for the integer types was reversed; the standard pattern in
    these files are:
    
    #ifndef __s390x__
    /* 32-bit code */
    #else
    /* 64-bit code */
    #endif
    
    Stick with the original pattern, but make sure the 32-bit code
    actually comes first!
    
    Reported by Al Viro.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>

commit cb0e8b0fba53e1aa6c4786bc465cfc641e8a77e7
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Tue Apr 29 23:33:47 2008 +0400

    [MIPS] Pb1000: bury the remnants of the PCI code
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 005ca9a3f1238ffebd9c4d09d581f708277d2985
Author: Thiemo Seufer <ths@networkno.de>
Date:   Tue May 6 11:23:33 2008 +0100

    [MIPS] Fix build failure in mips oprofile code
    
    This patch fixes a warning-as-error induced build failure of 64bit MIPS
    kernels.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 83738e307365aa2de4a1be65ed574aaebce52ea0
Author: Thiemo Seufer <ths@networkno.de>
Date:   Tue May 6 11:21:22 2008 +0100

    [MIPS] fix warning message on SMP kernels
    
    This patch fixes a (harmless) warning message.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b01273f120a390363ceb27bd0ccc60ddf1fb936d
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sun May 4 19:58:54 2008 +0300

    [MIPS] markeins: build fix
    
    This patch fixes the following build errror caused by
    commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168
    (ntp: handle leap second via timer):
    
    <--  snip  -->
    
    ...
      CC      arch/mips/emma2rh/markeins/setup.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/emma2rh/markeins/setup.c:79: error: conflicting types for 'clock'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/clocksource.h:96: error: previous declaration of 'clock' was here
    make[2]: *** [arch/mips/emma2rh/markeins/setup.o] Error 1
    
    <--  snip  -->
    
    [Ralf: reformated to 80 colums after the fix and marked emma2rh_clock as
    __initdata]
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d303f4a1a09b18e9689aa896bbc23879130b1da8
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Sun May 4 17:50:02 2008 +0100

    [MIPS] ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ddc0d009947bf8645fa3543f4532063a787202da
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Sun May 4 14:53:53 2008 +0100

    [MIPS] Get rid of __ilog2
    
    56a6b1eb7bfb5ace0b5cb9c149f502fbd101b8ab was a bit too conservative and
    left __ilog2 around which is only used as an internal function for other
    bitops.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fcd84f2fca49166dab2dba259eca6e633585763f
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sun May 4 00:25:02 2008 +0200

    [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
    
    Only MIPS32 and MIPS64 CPUs implement clz/dclz. Therefore don't export
    __ilog2() for non MIPS32/MIPS64 cpus and use generic __fls bitop code for
    these cpus.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7ff83f21d23d17b63bbb984fee5d12aa5a8066b3
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:31:03 2008 +0400

    [MIPS] XXS1500 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - remove needless parentheses;
    
    - remove unneeded numeric literal type cast;
    
    - insert spaces between operator and its operands;
    
    - remove excess new lines;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the structure initializer;
    
    - fix typos, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1ff1a78cbb6fb6ceafac1b2cbdd72c939a7c9bae
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:30:12 2008 +0400

    [MIPS] MTX-1 code style cleanup
    
    Fix many errors and warnings given by checkpatch.pl:
    
    - space after opening and before closing parentheses;
    
    - use of C99 // comments;
    
    - leading spaces instead of tabs;
    
    - brace not on the same line with 'else' in the 'if' statement;
      statement;
    
    - printk() without KERN_* facility level;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    - including <asm/gpio.h> instead of <linux/gpio.h>.
    
    In addition to these changes, also do the following:
    
    - insert spaces between operator and its operands;
    
    - replace tab between the function type and name with space in
      mtx1_pci_idsel() declaration;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array/structure
      initializers;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c3d1d5c8c10c937c65186f6dac75e2fb4675ef07
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:29:04 2008 +0400

    [MIPS] Pb1200/DBAu1200 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - initialization of a 'static' variable to 0;
    
    - space after opening and before closing parentheses;
    
    - missing space between 'for' and opening parenthesis;
    
    - macros with complex values not enclosed in parentheses;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - mention DBAu1200 board in the Makefile;
    
    - replace the group of #include/#ifdef directives by a single
      #include <au1xxx.h> since this header contains the needed stuff;
    
    - properly indent the blocks;
    
    - insert spaces between operator and its operands, remove excess spaces
      there;
    
    - remove needless parentheses and add some for clarity;
    
    - replace numeric literals/expressions with the matching macros;
    
    - remove space after the type cast's closing parenthesis;
    
    - reduce pb1200_setup_cascade() to the single 'return' statement;
    
    - reduce the number of printed empty lines in the so-called CPLD
      workaround;
    
    - remove #undef AU1X00_EXTERNAL_INT since that macro is not defined
      anywhere;
    
    - replace spaces after the macro name with tabs in the #define directives;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typo in the BCSR_RESETS_PWMR1mUX macro's name;
    
    - group all Pb1200 PCMCIA definitions together;
    
    - put the function's result type and name/parameters on the same line;
    
    - insert missing and remove excess new lines;
    
    - make the multi-line comment style consistent with the kernel style
      elsewhere by adding empty first line and/or adding space/asterisk on
      their left side;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - combine some comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 6afabe6c9335c0534224b53c3db4b091621af2dd
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:28:17 2008 +0400

    [MIPS] Pb1550 code style cleanup
    
    Fix a few errors and warnings given by checkpatch.pl:
    
    - macros with complex values not enclosed in parentheses;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - replace numeric literals with the matching macros;
    
    - properly indent the code and the array initializers;
    
    - insert spaces between operator and its operands, also remove excess spaces
      there;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives, also
      sometimes insert space there for better looks;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2091a17ff7f32432976d1eacbb79a06819d95301
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:27:20 2008 +0400

    [MIPS] Pb1500 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - replace numeric literals/expressions with the matching macros;
    
    - insert spaces between operator and its operands;
    
    - properly indent the code and the array initializers;
    
    - remove useless #if dirctive from board_setup();
    
    - remove needless parentheses;
    
    - remove unneeded type casts;
    
    - remove excess new lines;
    
    - make hexadecimal literals all lower case;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives,
      also sometimes insert space there for better looks;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit be1c3c1ed13f31ae8f9d5d043d96d2e56b5ee1d5
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:26:28 2008 +0400

    [MIPS] Pb1100 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - space between asterisk and variable name;
    
    - use of C99 // comments;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - properly indent the code;
    
    - remove space after the type cast's closing parenthesis;
    
    - replace numeric literals/expressions with the matching macros;
    
    - replace spaces after the macro name with tabs in the #define directives,
      and sometimes insert spaces there;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style
      elsewhere by adding empty first line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7916c3548e53bffb0545a1d0dc7fde86d79add92
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:25:55 2008 +0400

    [MIPS] Pb1000 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - brace not on the same line with condition in the 'switch' statement;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - properly indent the 'switch' statement;
    
    - remove needless parentheses;
    
    - insert spaces between operator and its operands;
    
    - replace numeric literals/expressions with the matching macros;
    
    - remove useless #if dirctive from board_setup();
    
    - remove unneeded numeric literal type casts;
    
    - remove space after the type cast's closing parenthesis;
    
    - replace spaces after the macro name with tabs in the #define directives, and
      sometimes insert spaces there;
    
    - remove excess new lines;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first/last line;
    
    - combine some comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit abd14cc00d940b8b5b4fc92be23f656b57c6ecfe
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:25:04 2008 +0400

    [MIPS] DBAu1xx0 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - macros with complex values not enclosed in parentheses;
    
    - leading spaces instead of tabs;
    
    - printk() without KERN_* facility level;
    
    - using simple_strtol() where strict_strtol() could be used;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - initialize variable instead of assigning value later where it makes sense;
    
    - insert spaces between operator and its operands, also remove excess spaces
      there;
    
    - remove unneeded numeric literal type casts;
    
    - remove needless parentheses;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first/last line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a9633279cf13de15b7002b71a507baf89d0619ca
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:23:27 2008 +0400

    [MIPS] Alchemy PCI code style cleanup
    
    Fix 15 errors and 4 warnings given by checkpatch.pl:
    
    - space between the asterisk and variable name;
    
    - space after opening and before closing parentheses;
    
    - leading spaces instead of tabs;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - combine the nested 'if' statements into one when possible;
    
    - remove needless parentheses;
    
    - add missing and remove excess spaces between operator and its operands;
    
    - fix printk() format specifiers mismatching the argument types;
    
    - put the function's result type and name/parameters on the same line;
    
    - insert missing and remove excess new lines;
    
    - properly indent multi-line expressions;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line;
    
    - fix typos, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c1dcb14ec2ae3c594ce1c2db953004083f2bd4a0
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:18:41 2008 +0400

    [MIPS] Alchemy common code style cleanup
    
    Fix many errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - missing space between the type and asterisk in a variable declaration;
    
    - space between the asterisk and function/variable name;
    
    - leading spaces instead of tabs;
    
    - space after opening and before closing parentheses;
    
    - initialization of a 'static' variable to 0;
    
    - missing spaces around assignement/comparison operator;
    
    - brace not on the same line with condition (or 'else') in the 'if'/'switch'
      statement;
    
    - missing space between 'if'/'for'/'while' and opening parenthesis;
    
    - use of assignement in 'if' statement's condition;
    
    - printk() without KERN_* facility level;
    
    - EXPORT_SYMBOL() not following its function immediately;
    
    - unnecessary braces for single-statement block;
    
    - adding new 'typedef' (where including <linux/types.h> will do);
    
    - use of 'extern' in the .c file (where it can be avoided by including header);
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - insert missing space after opening brace and/or before closing brace in the
      structure initializers;
    
    - insert spaces between operator and its operands;
    
    - put the function's result type and name/parameters on the same line;
    
    - properly indent multi-line expressions;
    
    - remove commented out code;
    
    - remove useless initializers and code;
    
    - remove needless parentheses;
    
    - fix broken/excess indentation;
    
    - add missing spaces between operator and its operands;
    
    - insert missing and remove excess new lines;
    
    - group 'else' and 'if' together where possible;
    
    - make au1xxx_platform_init() 'static';
    
    - regroup variable declarations in pm_do_freq() for prettier look;
    
    - replace numeric literals with the matching macros;
    
    - fix printk() format specifiers mismatching the argument types;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line and/or adding space on their left side;
    
    - make two-line comments that only have one line of text one-line;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - fix/remove obsolete references in the comments;
    
    - reformat some comments;
    
    - add comment about the CPU:counter clock ratio to calc_clock();
    
    - update MontaVista copyright;
    
    - remove Pete Popov's and Steve Longerbeam's old email addresses...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ff6814d53016081947ff4021e00db3f806a561c9
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:18:35 2008 +0400

    [MIPS] Alchemy common headers style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - space after opening and before closing parentheses;
    
    - opening brace following 'struct' not on the same line;
    
    - leading spaces instead of tabs;
    
    - use of C99 // comments;
    
    - macros with complex values not enclosed in parentheses;
    
    - missing space between the type and asterisk in a variable declaration;
    
    - space between asterisk and function name;
    
    - including <asm/io.h> instead of <linux/io.h> and <asm/irq.h> instead of
      <linux/irq.h>;
    
    - use of '__inline__' instead of 'inline';
    
    - space between function name and opening parenthesis;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - remove needless parentheses;
    
    - insert spaces between operator and its operands;
    
    - replace spaces after the macro name with tabs in the #define directives and
      after the type in the structure field declarations;
    
    - remove excess tabs after the macro name in the #define directives and in the
      'extern' variable declarations;
    
    - remove excess spaces between # and define for the SSI_*_MASK macros to align
      with other such macros;
    
    - put '||' operator on the same line with its first operand;
    
    - properly indent multi-line function prototypes;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line and/or adding space/asterisk on their left side;
    
    - make two-line comments that only have one line of text one-line;
    
    - convert the large multi-line comment in au1xxx_ide.h into several one-liners,
      replace spaces with tabs there;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - insert missing and remove excess new lines;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's and Steve Longerbeam's old email addresses...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ad1d77a38575644b112340fd9115ac21dd533166
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Thu May 1 15:28:53 2008 +0100

    [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
    
    This is to clarify that GCC_IMM_ASM does not take an argument as the
    context of the macro's invocation seems to imply.
    
    As suggested by Maciej W. Rozycki (macro@linux-mips.org).
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1c9e919f48a49fda2ff2c607891cc17024e75122
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Apr 18 19:23:01 2008 -0400

    [MIPS] msp_hwbutton.c: minor irq handler cleanups
    
    - remove always-true test
    
    - neaten request_irq() indentation
    
    This change's main purpose is to prepare for the patchset in
    jgarzik/misc-2.6.git#irq-remove, that explores removal of the
    never-used 'irq' argument in each interrupt handler.
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a64063046026729a69ad06c94453f4ddaa562d60
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon Apr 21 11:51:37 2008 +0300

    [MIPS] unexport __kmap_atomic_to_page
    
    This patch removes the no longer used export of __kmap_atomic_to_page.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit dc3bf3532bf7240cf117b8ecf3d16526810eba6a
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Fri Apr 18 10:56:07 2008 +0100

    [MIPS] Initialize max_pfn again.
    
    This was dropped by
    
    commit a0d9e2d891e4cf54676c430da63bd4a17d1cdb80 (lmo)
    commit b6f1f0dea1469e0c956eb89399916d60dd2a3808 (ko)
    Author: Franck Bui-Huu <vagabon.xyz@gmail.com>
    Date:   Fri Aug 11 17:51:48 2006 +0200
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f4324f3eeb311d1889b8c25076f2669012323842
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Wed Apr 16 19:55:26 2008 +0100

    [MIPS] IRIX: Handle do_brk() error return correctly.
    
    do_brk's return value was stored in an unsigned long variable before being
    tested for less than zero making the test always fail.  Also do_brk's
    called irix_map_prda_page wasn't forwarding do_brk() success.
    
    Bug checking the return value of do_brk() and initial fix for it found
    by Roel Kluin <12o3l@tiscali.nl>.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1928cc84a0a937ce7042d9235996ab380f36f18a
Author: Kevin D. Kissell <kevink@mips.com>
Date:   Wed Apr 16 15:32:22 2008 +0200

    [MIPS] MT: Functional fixes and a little reformatting of APRP support
    
    Signed-off-by: Kevin D. Kissell <kevink@mips.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9f2546adedda600687bba6ef3e1546a8ecbc16eb
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Thu Apr 17 13:42:50 2008 +0100

    [MIPS] Don't use max_pfn which is no longer initialized these days.
    
    Still won't play nicely with esotheric configurations such as discontig
    memory ...
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d0e7ba063233105febd960e0716d5e9fd9159307
Author: Roel Kluin <12o3l@tiscali.nl>
Date:   Wed Apr 16 17:09:58 2008 +0200

    [MIPS] ip27-timer: fix unsigned irq < 0
    
    Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
    Acked-By: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b618336aac146df24ace641dff69dc46675886c9
Author: Kevin D. Kissell <kevink@mips.com>
Date:   Wed Apr 16 15:32:22 2008 +0200

    [MIPS] Fixes necessary for non-SMP kernels and non-relocatable binaries
    
    Signed-off-by: Kevin D. Kissell <kevink@mips.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 8e07c2c6af30dccfa573033d280980b2b5eb35fe
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Sat Apr 5 22:16:21 2008 +0400

    [MIPS] Alchemy: SMBus resource fix
    
    The Alchemy platform code registers the SMBus device using the virtual
    address of its registers instead of the physical one -- fix this, taking
    into account that actually the whole megabyte is decoded by any of the
    programmable serial controllers (one of which is SMBus), and that all the
    Alchemy peripherals are directly mappable into KSEG1 kernel space and
    therefore ioremap() call would just boil down to CKSEG1ADDR() invocation.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9f1a0735395ba2b2efa5012b5bf7f915299f1a79
Author: Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
Date:   Mon May 12 19:35:31 2008 +0900

    Fix c67x00-ll-hpi compilation failure (bug #10627)
    
    This patch fixes bug #10627 which caused the compilation error below.
    
      CC [M]  drivers/usb/c67x00/c67x00-ll-hpi.o
      drivers/usb/c67x00/c67x00-ll-hpi.c: In function `ll_recv_msg':
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: `HZ' undeclared (first use in this function)
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: (Each undeclared identifier is reported only once
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: for each function it appears in.)
    
    Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3c29970c02829a91ab337abea2860973b291bd48
Merge: 59b1c82... 0d4b6b9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 07:29:08 2008 -0700

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] ppc: More compile fixes
      [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
      [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
      [POWERPC] ppc: Use ebony_defconfig for defconfig
      [POWERPC] Fix default cputable entries for e200 and e500 families

commit 59b1c82500bb5d658891bc8e8a2308b76d58a4de
Merge: 454aa38... a94a172...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 07:28:37 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Work around memory probing bug in openfirmware.
      sparc32: fix rtrap.S typo
      sparc32: Fix build.

commit 454aa3899f0bebb5aa7f8788690668d106f9a34f
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon May 12 12:31:37 2008 +0100

    cris: Fix compile failure due to typo in serial driver
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 79f999d0aa264f72f5491be14b4bf60137a3d3a9
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon May 12 12:29:25 2008 +0100

    strip: Fix termios assumption
    
    Strip assumes that the tty drivers always have a set_termios method which
    may not be true. Check this when binding to the tty so that we don't oops
    later.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0d4b6b901c3d41beb0e1620316aee0aa234edf7f
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon May 12 22:57:51 2008 +1000

    [POWERPC] ppc: More compile fixes
    
    This fixes a few more miscellaneous compile problems with ARCH=ppc.
    
    1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags.
    2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition.
    3. Include <linux/proc_fs.h> in residual.c for the
       definition of create_proc_read_entry.
    4. Fix xchg_ptr to be a static inline to eliminate a compiler warning.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 4951704b4e23d71b99ac933d8e6993bc6225ac13
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 12 03:29:11 2008 -0700

    syncppp: Fix crashes.
    
    The syncppp layer wants a mid-level netdev private pointer.
    
    It was using netdev->priv but that only worked by accident,
    and thus this scheme was broken when the device private
    allocation strategy changed.
    
    Add a proper mid-layer private pointer for uses like this,
    update syncppp and all users, and remove the HDLC_PPP broken
    tag from drivers/net/wan/Kconfig
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6a8b23086c82d7cc4f424518532c8b10d95715c0
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:50 2008 +1000

    [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
    
    arch/ppc doesn't have prom_init.o (anymore).
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 9717e87fb19f21d1be2ac1dce8f65045547b7e1b
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:49 2008 +1000

    [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
    
    It needs it:
    
    	arch/ppc/kernel/ppc_ksyms.c:152: error: '__flush_icache_range'
    	undeclared here (not in a function)
    
    and a few more like that.
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 426e53fcbab76b68524f8f07c2afd7a4340c627a
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:48 2008 +1000

    [POWERPC] ppc: Use ebony_defconfig for defconfig
    
    We used to use common_defconfig, but it was removed some time ago.
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit c4492586a618d18e8a5343a04bad0ec606064846
Author: Wei Yongjun <yjwei@cn.fujitsu.com>
Date:   Fri May 9 15:11:53 2008 -0700

    sctp: Add address type check while process paramaters of ASCONF chunk
    
    If socket is create by AF_INET type, add IPv6 address to asoc will cause
    kernel panic while packet is transmitted on that transport.
    
    This patch add address type check before process paramaters of ASCONF
    chunk. If peer is not support this address type, return with error
    invald parameter.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6e40a915de82e00d18f75941e531b40c4e0d94c4
Author: Wei Yongjun <yjwei@cn.fujitsu.com>
Date:   Fri May 9 15:11:17 2008 -0700

    sctp: Do not enable peer IPv6 address support on PF_INET socket
    
    If socket is create by PF_INET type, it can not used IPv6 address to
    send/recv DATA, So we can not used IPv6 address even if peer tell us it
    support IPv6 address.
    This patch fix to only enabled peer IPv6 address support on PF_INET6 socket.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f9af857489cc19ee3acd0d5248dca7d243e353a5
Author: Matheos Worku <matheos.worku@sun.com>
Date:   Mon May 12 03:10:59 2008 -0700

    niu: Determine the # of ports from the card's VPD data
    
    Determine the number of physical ports from the card's VPD data.
    Previous fix failed on Maramba platform which doesn't have the
    "board-model" property. This fix uses the "model" property which
    exists on all cards and Neptune based motherboards.
    
    cstyle cleanup included.
    
    Signed-off-by: Matheos Worku <matheos.worku@sun.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 516c8be3a93ec2b0746ba0907f38c1d1e62f4992
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon May 12 14:20:35 2008 +1000

    [POWERPC] Fix default cputable entries for e200 and e500 families
    
    Commit 76bc080ef5a34aedb63e1691f28c6b42f3468e4e ("POWERPC] Make default
    cputable entries reflect selected CPU family") added default entries
    for the e200 and e500 families, but missed a closing brace on those
    entries, as pointed out by David Gibson.  This adds the closing braces.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit a94a172d6c826232e623160ae134abbce181a41f
Author: David S. Miller <davem@davemloft.net>
Date:   Sun May 11 21:04:48 2008 -0700

    sparc64: Work around memory probing bug in openfirmware.
    
    Read all of the OF memory and translation tables, then read
    the physical available memory list twice.
    
    When making these requests, OF can allocate more memory to
    do it's job, which can remove pages from the available
    memory list.
    
    So fetch in all of the tables at once, and fetch the available
    list last to make sure we read a stable value.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8bf3028ede10dfe22e1729ebad96f6eb77020712
Author: Robert Reif <reif@earthlink.net>
Date:   Sun May 11 18:05:20 2008 -0700

    sparc32: fix rtrap.S typo
    
    Fix compile problem in rtrap.S
    
    arch/sparc/kernel/built-in.o: In function `ret_trap_userwins_ok':
    arch/sparc/kernel/rtrap.S:(.text+0x1900): undefined reference to
    `PSR_SYCALL'
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b5e10df665e756c2c68442177e460d90bb9cf979
Author: Robert Reif <reif@earthlink.net>
Date:   Sun May 11 15:47:05 2008 -0700

    sparc32: Fix build.
    
    Fix sparc32 build error due to undefined bool type.
    
    CC [M] fs/ocfs2/dlm/userdlm.o
    In file included from include/asm/sigcontext.h:6,
    from include/asm/signal.h:5,
    from include/linux/signal.h:4,
    from fs/ocfs2/dlm/userdlm.c:30:
    include/asm/ptrace.h:42: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
    ‘__attribute__’ before ‘pt_regs_is_syscall’
    include/asm/ptrace.h:47: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
    ‘__attribute__’ before ‘pt_regs_clear_syscall’
    make[3]: *** [fs/ocfs2/dlm/userdlm.o] Error 1
    make[2]: *** [fs/ocfs2/dlm] Error 2
    make[1]: *** [fs/ocfs2] Error 2
    make: *** [fs] Error 2
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e691b9d1a096fbaaff9d6d6aef1adc593b786e62
Author: Steve French <sfrench@us.ibm.com>
Date:   Sun May 11 15:53:33 2008 +0000

    [CIFS] don't allow demultiplex thread to exit until kthread_stop is called
    
    cifs_demultiplex_thread can exit under several conditions:
    
    1) if it's signaled
    2) if there's a problem with session setup
    3) if kthread_stop is called on it
    
    The first two are problems. If kthread_stop is called on the thread,
    there is no guarantee that it will still be up. We need to have the
    thread stay up until kthread_stop is called on it.
    
    One option would be to not even try to tear things down until after
    kthread_stop is called. However, in the case where there is a problem
    setting up the session, there's no real reason to try continuing the
    loop.
    
    This patch allows the thread to clean up and prepare for exit under all
    three conditions, but it has the thread go to sleep until kthread_stop
    is called. This allows us to simplify the shutdown code somewhat since
    we can be reasonably sure that the thread won't exit after being
    signaled but before kthread_stop is called.
    
    It also removes the places where the thread itself set the tsk variable
    since it appeared that it could have a potential race where the thread
    might never be shut down.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Acked-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 67750fb9e07940c078d1edb16fd736ccc92a4a4e
Author: Jeff Layton <jlayton@redhat.com>
Date:   Fri May 9 22:28:02 2008 +0000

    [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir
    
    When creating a directory on a CIFS share without POSIX extensions,
    and the given mode has no write bits set, set the ATTR_READONLY bit.
    
    When creating a file, set ATTR_READONLY if the create mode has no write
    bits set and we're not using unix extensions.
    
    There are some comments about this being problematic due to the VFS
    splitting creates into 2 parts. I'm not sure what that's actually
    talking about, but I'm assuming that it has something to do with how
    mknod is implemented. In the simple case where we have no unix
    extensions and we're just creating a regular file, there's no reason
    we can't set ATTR_READONLY.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 02eadeffda169a45946c79270ec19f45eeafb8e7
Author: Jeff Layton <jlayton@redhat.com>
Date:   Fri May 9 21:26:11 2008 +0000

    [CIFS]  add local struct inode pointer to cifs_setattr
    
    Clean up cifs_setattr a bit by adding a local inode pointer, and
    changing all of the direntry->d_inode references to it. This also adds a
    bit of micro-optimization. d_inode shouldn't change over the life of
    this function, so we only need to dereference it once.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 1b20d672188bf80baef60d515a123f556871a5ce
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Fri May 9 18:17:21 2008 +0000

    [CIFS] cifs_find_tcp_session cleanup
    
    This patch cleans up cifs_find_tcp_session so it become
    less indented. Also the error of skipping IPv6 matched
    addresses fixed.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 64976a0387835a7ac61bbe2a99b27ccae34eac5d
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sat May 10 14:08:40 2008 -0500

    [SCSI] aha152x: Fix oops on module removal
    
    Reported-by: Frank de Jong <frapex@xs4all.nl>
    > after trying to unload the module:
    > BUG: unable to handle kernel paging request at 00100100
    > IP: [<fb9ff667>] :aha152x:aha152x_exit+0x47/0x6a
    > *pde = 00000000
    > Oops: 0000 [#1] PREEMPT SMP
    > Modules linked in: aha152x(-) w83781d hwmon_vid tun ne 8390 bonding
    > usb_storage snd_usb_audio snd_usb_lib snd_rawmidi pwc snd_seq_device
    > compat_ioctl32 snd_hwdep videodev v4l1_compat 3c59x mii intel_agp
    > agpgart snd_pcm_oss snd_pcm snd_timer snd_page_alloc snd_mixer_oss snd
    >
    > Pid: 2837, comm: rmmod Not tainted (2.6.25.3 #1)
    > EIP: 0060:[<fb9ff667>] EFLAGS: 00210212 CPU: 0
    > EIP is at aha152x_exit+0x47/0x6a [aha152x]
    > EAX: 00000001 EBX: 000ffdc4 ECX: f7c517a8 EDX: 00000001
    > ESI: 00000000 EDI: 00000003 EBP: e7880000 ESP: e7881f58
    >   DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
    > Process rmmod (pid: 2837, ti=e7880000 task=f27eb580 task.ti=e7880000)
    > Stack: fba03700 c01419d2 31616861 00783235 e795ee70 c0157709 b7f24000 e79ae000
    >         c0158271 ffffffff b7f25000 e79ae004 e795e370 b7f25000 e795e37c e795e370
    >         009ae000 fba03700 00000880 e7881fa8 00000000 bf93ec20 bf93ec20 c0102faa
    > Call Trace:
    >   [<c01419d2>] sys_delete_module+0x112/0x1a0
    >   [<c0157709>] remove_vma+0x39/0x50
    >   [<c0158271>] do_munmap+0x181/0x1f0
    >   [<c0102faa>] sysenter_past_esp+0x5f/0x85
    >   [<c0490000>] rsc_parse+0x0/0x3c0
    
    The problem is that the driver calls aha152x_release() under a
    list_for_each_entry().  Unfortunately, aha152x_release() deletes from
    the list in question.  Fix this by using list_for_each_entry_safe().
    
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit ad2fa42d044b98469449880474a9662fb689f7f9
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sat May 10 08:33:58 2008 -0500

    [SCSI] aha152x: fix init suspiciously returned 1, it should follow 0/-E convention
    
    Reported-by: Frank de Jong <frapex@xs4all.nl>
    > [1.] One line summary of the problem:
    > linux-2.6.25.3, aha152x'->init suspiciously returned 1, it should
    > follow 0/-E convention. The module / driver works okay. Unloading the
    > module is impossible.
    
    The driver is apparently returning 0 on failure and 1 on success.
    That's a bit unfortunate.  Fix it by altering to -ENODEV and 0.
    
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit c8611f975403dd20e6503aff8aded5dcb718f75b
Author: Mike Christie <michaelc@cs.wisc.edu>
Date:   Thu May 8 20:15:34 2008 -0500

    [SCSI] libiscsi regression in 2.6.25: fix setting of recv timer
    
    If the ping tmo is longer than the recv tmo then we could miss a window
    where we were supposed to check the recv tmo. This happens because
    the ping code will set the next timeout for the ping timeout, and if the
    ping executes quickly there will be a long chunk of time before the
    timer wakes up again.
    
    This patch has the ping processing code kick off a recv
    tmo check when getting a nop in response to our ping.
    
    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 4cf1043593db6a337f10e006c23c69e5fc93e722
Author: Mike Christie <michaelc@cs.wisc.edu>
Date:   Wed May 7 20:43:52 2008 -0500

    [SCSI] libiscsi regression in 2.6.25: fix nop timer handling
    
    The following patch fixes a bug in the iscsi nop processing.
    The target sends iscsi nops to ping the initiator and the
    initiator has to send nops to reply and can send nops to
    ping the target.
    
    In 2.6.25 we moved the nop processing to the kernel to handle
    problems when the userspace daemon is not up, but the target
    is pinging us, and to handle when scsi commands timeout, but
    the transport may be the cause (we can send a nop to check
    the transport). When we added this code we added a bug where
    if the transport timer wakes at the exact same time we are supposed to check
    for a nop timeout we drop the session instead of checking the transport.
    
    This patch checks if a iscsi ping is outstanding and if the ping has
    timed out, to determine if we need to signal a connection problem.
    
    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit a85591fd0baf4ed3f03ee1aaac6a985e400cf089
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun May 4 22:35:58 2008 -0500

    [SCSI] gdth: fix Error: Driver 'gdth' is already registered, aborting...
    
    This message appears on modprobe/rmmod/modprobe of the driver.  It's
    caused because if the driver has no instances, it returns an error
    from gdth_init, which causes the module to fail to load.
    Unfortunately, the module's pci driver is still registered at this
    point.
    
    Fix this by making gdth behave like a modern driver and insert even if
    it doesn't find any instances (in case of hot plug or software driven
    binding).
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 2d6f0d0cd94f9b8b24102300d8dd9cbbd1688826
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun May 4 22:34:49 2008 -0500

    [SCSI] gdth: fix timer handling
    
    The global timer handling is problematic in that if someone unbinds a
    PCI gdth instance, the BUG_ON() in the timer will cause a panic.
    
    Fix this by making the timer start and stop depending on whether there
    are instances present.  This should also permit binding and unbinding
    to work.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>