commit f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b
Merge: 0bac038... ac8581d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Jan 17 14:28:53 2009 -0800

    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:
      IB/ehca: Use consistent types for ehca_plpar_hcall9()
      IB/ehca: Fix printk format warnings from u64 type change
      IPoIB: Do not print error messages for multicast join retries
      IB/mlx4: Fix memory ordering problem when posting LSO sends
      mlx4_core: Fix min() warning
      IPoIB: Fix deadlock between ipoib_open() and child interface create
      IPoIB: Fix hang in napi_disable() if P_Key is never found

commit 0bac038a9eec00ac27f95ca0360954c0016fd859
Merge: 8115692... 5dbdf73...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Jan 17 14:28:23 2009 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      move wm8400-regulator's probe function to .devinit.text

commit 81156928f8fe31621e467490b9d441c0285998c3
Author: Pavel Roskin <proski@gnu.org>
Date:   Sat Jan 17 13:33:03 2009 -0500

    dell_rbu: use scnprintf() instead of less secure sprintf()
    
    Reading 0 bytes from /sys/devices/platform/dell_rbu/image_type or
    /sys/devices/platform/dell_rbu/packet_size by an ordinary user causes an
    oops.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0d54ee1c7850a954026deec4cd4885f331da35cc
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date:   Sat Jan 17 17:45:45 2009 +0100

    security: introduce missing kfree
    
    Plug this leak.
    
    Acked-by: David Howells <dhowells@redhat.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5dbdf7354821e00e4419ac3520d05d126857d56e
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date:   Mon Jan 12 23:25:05 2009 +0100

    move wm8400-regulator's probe function to .devinit.text
    
    A pointer to wm8400_regulator_probe is passed to the core via
    platform_driver_register and so the function must not disappear when the
    .init sections are discarded.  Otherwise (if also having HOTPLUG=y)
    unbinding and binding a device to the driver via sysfs will result in an
    oops as does a device being registered late.
    
    An alternative to this patch is using platform_driver_probe instead of
    platform_driver_register plus removing the pointer to the probe function
    from the struct platform_driver.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

commit ac8581d408d41ebd5583b4e85b18e7ef16bb044b
Merge: ee96aae... 3c20962... 0fd7e1d...
Author: Roland Dreier <rolandd@cisco.com>
Date:   Fri Jan 16 15:05:54 2009 -0800

    Merge branches 'ehca', 'ipoib' and 'mlx4' into for-linus

commit ee96aae57381e77311538f4a1dd4326f6ae079d1
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Fri Jan 16 14:55:40 2009 -0800

    IB/ehca: Use consistent types for ehca_plpar_hcall9()
    
    ehca_plpar_hcall9() takes an unsigned long array, so make all callers
    pass that in.  This fixes warnings introduced by commit fe333321
    ("powerpc: Change u64/s64 to a long long integer type"), which changed
    u64 from unsigned long to unsigned long long.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 3750f60557b68776eb749859ad68af70d1a01ad0
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Fri Jan 16 14:55:28 2009 -0800

    IB/ehca: Fix printk format warnings from u64 type change
    
    Commit fe333321 ("powerpc: Change u64/s64 to a long long integer
    type") changed u64 from unsigned long to unsigned long long, which
    means that printk formats for printing u64 values should use "ll"
    instead of "l" to avoid warnings.  Fix all the places affected by this
    in ehca.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 3c20962086b0ceb5498ba840e5a91bf4a692aae9
Author: Yossi Etigin <yosefe@Voltaire.COM>
Date:   Fri Jan 16 13:42:59 2009 -0800

    IPoIB: Do not print error messages for multicast join retries
    
    When IPoIB tries to join a multicast group, and the SA module's SM
    address handle is NULL (because of an SM change, etc), the join
    returns with -EAGAIN status.  In that case, don't print an error
    message unless multicast debugging is enabled.
    
    Signed-off-by: Yossi Etigin <yosefe@voltaire.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 0fd7e1d8559f45a6838cee93ea49adc0c5bda8f0
Author: Roland Dreier <rolandd@cisco.com>
Date:   Fri Jan 16 12:47:47 2009 -0800

    IB/mlx4: Fix memory ordering problem when posting LSO sends
    
    The current work request posting code writes the LSO segment before
    writing any data segments.  This leaves a window where the LSO segment
    overwrites the stamping in one cacheline that the HCA prefetches
    before the rest of the cacheline is filled with the correct data
    segments.  When the HCA processes this work request, a local
    protection error may result.
    
    Fix this by saving the LSO header size field off and writing it only
    after all data segments are written.  This fix is a cleaned-up version
    of a patch from Jack Morgenstein <jackm@dev.mellanox.co.il>.
    
    This fixes <https://bugs.openfabrics.org/show_bug.cgi?id=1383>.
    
    Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit d3b924d960a808105180d229b4667061123cc4ef
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Thu Jan 15 20:43:56 2009 -0800

    mlx4_core: Fix min() warning
    
    Fix
    
        drivers/net/mlx4/profile.c: In function `mlx4_make_profile':
        drivers/net/mlx4/profile.c:110: warning: comparison of distinct pointer types lacks a cast
    
    This happened because num_possible_cpus() was secretly changed by
    commit ae7a47e7 ("cpumask: make cpumask.h eat its own dogfood.") from
    returning "int" to (now) returning "unsigned int".  I think that was a
    good change, so we should just swallow the fallout.
    
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Roland Dreier <rolandd@cisco.com>
    Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
    Cc: Jack Morgenstein <jackm@dev.mellanox.co.il>
    Cc: Vladimir Sokolovsky <vlad@mellanox.co.il>
    Cc: Michael S. Tsirkin <mst@dev.mellanox.co.il>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit cbbe1efa4972350286b52cb48aefaa11e198c0fb
Author: Roland Dreier <rolandd@cisco.com>
Date:   Wed Jan 14 21:44:39 2009 -0800

    IPoIB: Fix deadlock between ipoib_open() and child interface create
    
    Fix a deadlock between child interface creation/deletion and ipoib
    start/stop.  The former takes vlan_mutex, and then might take RTNL via
    register_netdev()/unregister_netdev().  The latter is executed with
    RTNL held, and tries to take vlan_mutex, which can lead to an AB-BA
    deadlock.
    
    Fix this by having the child interface creation/deletion code take the
    RTNL first so vlan_mutex always nests inside RTNL.  We can use
    register_netdevice() for child interfaces because we form the
    interface name from the parent interface and hence don't need the '%'
    expansion of register_netdev().
    
    Reported-by: Yossi Etigin <yosefe@voltaire.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit b8a1b1ce14252b59b2d5c89de25b54f9bfd4cc5e
Author: Roland Dreier <rolandd@cisco.com>
Date:   Wed Jan 14 14:55:41 2009 -0800

    IPoIB: Fix hang in napi_disable() if P_Key is never found
    
    After commit fe25c561 ("IPoIB: Don't enable NAPI when it's already
    enabled"), if an interface is brought up but the corresponding P_Key
    never appears, then ipoib_stop() will hang in napi_disable(), because
    ipoib_open() returns before it does napi_enable().
    
    Fix this by changing ipoib_open() to call napi_enable() even if the
    P_Key isn't present.
    
    Reported-by: Yossi Etigin <yosefe@Voltaire.COM>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>