Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.34-rc6-gi…
Commits on May 5, 2010
  1. @torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms/legacy: only enable load detection property on DVI-I
      drm/radeon/kms: fix panel scaling adjusted mode setup
      drivers/gpu/drm/drm_sysfs.c: sysfs files error handling
      drivers/gpu/drm/radeon/radeon_atombios.c: range check issues
      gpu: vga_switcheroo, fix lock imbalance
      drivers/gpu/drm/drm_memory.c: fix check for end of loop
      drivers/gpu/drm/via/via_video.c: fix off by one issue
      drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference
      drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill
  2. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/x86/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
      powernow-k8: Fix frequency reporting
      x86: Fix parse_reservetop() build failure on certain configs
      x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests
      x86: Fix 'reservetop=' functionality
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      KEYS: Fix RCU handling in key_gc_keyring()
      KEYS: Fix an RCU warning in the reading of user keys
  4. KEYS: Fix RCU handling in key_gc_keyring()

    David Howells authored James Morris committed
    key_gc_keyring() needs to either hold the RCU read lock or hold the keyring
    semaphore if it's going to scan the keyring's list.  Given that it only needs
    to read the key list, and it's doing so under a spinlock, the RCU read lock is
    the thing to use.
    
    Furthermore, the RCU check added in e7b0a61 is
    incorrect as holding the spinlock on key_serial_lock is not grounds for
    assuming a keyring's pointer list can be read safely.  Instead, a simple
    rcu_dereference() inside of the previously mentioned RCU read lock is what we
    want.
    
    Reported-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Acked-by: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  5. KEYS: Fix an RCU warning in the reading of user keys

    David Howells authored James Morris committed
    Fix an RCU warning in the reading of user keys:
    
    ===================================================
    [ INFO: suspicious rcu_dereference_check() usage. ]
    ---------------------------------------------------
    security/keys/user_defined.c:202 invoked rcu_dereference_check() without protection!
    
    other info that might help us debug this:
    
    rcu_scheduler_active = 1, debug_locks = 0
    1 lock held by keyctl/3637:
     #0:  (&key->sem){+++++.}, at: [<ffffffff811a80ae>] keyctl_read_key+0x9c/0xcf
    
    stack backtrace:
    Pid: 3637, comm: keyctl Not tainted 2.6.34-rc5-cachefs #18
    Call Trace:
     [<ffffffff81051f6c>] lockdep_rcu_dereference+0xaa/0xb2
     [<ffffffff811aa55f>] user_read+0x47/0x91
     [<ffffffff811a80be>] keyctl_read_key+0xac/0xcf
     [<ffffffff811a8a06>] sys_keyctl+0x75/0xb7
     [<ffffffff81001eeb>] system_call_fastpath+0x16/0x1b
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  6. drm/radeon/kms/legacy: only enable load detection property on DVI-I

    Alex Deucher authored Dave Airlie committed
    DVI-D doesn't have analog.  This matches the avivo behavior.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. drm/radeon/kms: fix panel scaling adjusted mode setup

    Alex Deucher authored Dave Airlie committed
    This should duplicate exactly what the ddx does for both
    legacy and avivo.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on May 4, 2010
  1. @torvalds

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/jlbec/ocfs2
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: Avoid a gcc warning in ocfs2_wipe_inode().
      ocfs2: Avoid direct write if we fall back to buffered I/O
      ocfs2_dlmfs: Fix math error when reading LVB.
      ocfs2: Update VFS inode's id info after reflink.
      ocfs2: potential ERR_PTR dereference on error paths
      ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod()
      ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error path
      ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_symlink error path
      ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe code
      ocfs2: Reset status if we want to restart file extension.
      ocfs2: Compute metaecc for superblocks during online resize.
      ocfs2: Check the owner of a lockres inside the spinlock
      ocfs2: one more warning fix in ocfs2_file_aio_write(), v2
      ocfs2_dlmfs: User DLM_* when decoding file open flags.
  2. @torvalds

    Fix the x86_64 implementation of call_rwsem_wait()

    David Howells authored torvalds committed
    The x86_64 call_rwsem_wait() treats the active state counter part of the
    R/W semaphore state as being 16-bit when it's actually 32-bit (it's half
    of the 64-bit state).  It should do "decl %edx" not "decw %dx".
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c-core: Use per-adapter userspace device lists
      i2c: Fix probing of FSC hardware monitoring chips
      i2c-core: Erase pointer to clientdata on removal
  4. @torvalds

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Fix resource leak in failure path of perf_event_open()
  5. @torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      rcu: Fix RCU lockdep splat on freezer_fork path
      rcu: Fix RCU lockdep splat in set_task_cpu on fork path
      mutex: Don't spin when the owner CPU is offline or other weird cases
  6. i2c-core: Use per-adapter userspace device lists

    Jean Delvare authored
    Using a single list for all userspace devices leads to a dead lock
    on multiplexed buses in some circumstances (mux chip instantiated
    from userspace). This is solved by using a separate list for each
    bus segment.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Michael Lawnick <ml.lawnick@gmx.de>
  7. i2c: Fix probing of FSC hardware monitoring chips

    Jean Delvare authored
    Some FSC hardware monitoring chips (Syleus at least) doesn't like
    quick writes we typically use to probe for I2C chips. Use a regular
    byte read instead for the address they live at (0x73). These are the
    only known chips living at this address on PC systems.
    
    For clarity, this fix should not be needed for kernels 2.6.30 and
    later, as we started instantiating the hwmon devices explicitly based
    on DMI data. Still, this fix is valuable in the following two cases:
    * Support for recent FSC chips on older kernels. The DMI-based device
      instantiation is more difficult to backport than the device support
      itself.
    * Case where the DMI-based device instantiation fails, whatever the
      reason. We fall back to probing in that case, so it should work.
    
    This fixes kernel bug #15634:
    https://bugzilla.kernel.org/show_bug.cgi?id=15634
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Cc: stable@kernel.org
  8. i2c-core: Erase pointer to clientdata on removal

    Wolfram Sang authored Jean Delvare committed
    After discovering that a lot of i2c-drivers leave the pointer to their
    clientdata dangling, it was decided to let the core handle this issue.
    It is assumed that the core may access the private data after remove()
    as there are no guarantees for the lifetime of such pointers anyhow (see
    thread starting at http://lkml.org/lkml/2010/3/21/68)
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  9. ocfs2: Avoid a gcc warning in ocfs2_wipe_inode().

    Joel Becker authored
    gcc warns that a variable is uninitialized.  It's actually handled, but
    an early return fools gcc.  Let's just initialize the variable to a
    garbage value that will crash if the usage is ever broken.
    
    Signed-off-by: Joel Becker <joel.becker@oracle.com>
Commits on May 3, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: remove bad auth_x kmem_cache
      ceph: fix lockless caps check
      ceph: clear dir complete, invalidate dentry on replayed rename
      ceph: fix direct io truncate offset
      ceph: discard incoming messages with bad seq #
      ceph: fix seq counting for skipped messages
      ceph: add missing #includes
      ceph: fix leaked spinlock during mds reconnect
      ceph: print more useful version info on module load
      ceph: fix snap realm splits
      ceph: clear dir complete on d_move
  2. @liewegas

    ceph: remove bad auth_x kmem_cache

    liewegas authored
    It's useless, since our allocations are already a power of 2.  And it was
    allocated per-instance (not globally), which caused a name collision when
    we tried to mount a second file system with auth_x enabled.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  3. @liewegas

    ceph: fix lockless caps check

    liewegas authored
    The __ variant requires caller to hold i_lock.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  4. @liewegas

    ceph: clear dir complete, invalidate dentry on replayed rename

    liewegas authored
    If a rename operation is resent to the MDS following an MDS restart, the
    client does not get a full reply (containing the resulting metadata) back.
    In that case, a ceph_rename() needs to compensate by doing anything useful
    that fill_inode() would have, like d_move().
    
    It also needs to invalidate the dentry (to workaround the vfs_rename_dir()
    bug) and clear the dir complete flag, just like fill_trace().
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  5. @liewegas

    ceph: fix direct io truncate offset

    liewegas authored
    truncate_inode_pages_range wants the end offset to align with the last byte
    in a page.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  6. @liewegas

    ceph: discard incoming messages with bad seq #

    liewegas authored
    We can get old message seq #'s after a tcp reconnect for stateful sessions
    (i.e., the MDS).  If we get a higher seq #, that is an error, and we
    shouldn't see any bad seq #'s for stateless (mon, osd) connections.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  7. @liewegas

    ceph: fix seq counting for skipped messages

    liewegas authored
    Increment in_seq even when the message is skipped for some reason.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  8. @liewegas

    ceph: add missing #includes

    liewegas authored
    Signed-off-by: Sage Weil <sage@newdream.net>
  9. @liewegas

    ceph: fix leaked spinlock during mds reconnect

    liewegas authored
    Signed-off-by: Sage Weil <sage@newdream.net>
  10. @liewegas

    ceph: print more useful version info on module load

    liewegas authored
    Decouple the client version from the server side.  Print relevant protocol
    and map version info instead.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  11. @liewegas

    ceph: fix snap realm splits

    liewegas authored
    The snap realm split was checking i_snap_realm, not the list_head, to
    determine if an inode belonged in the new realm.  The check always failed,
    which meant we always moved the inode, corrupting the old realm's list and
    causing various crashes.
    
    Also wait to release old realm reference to avoid possibility of use after
    free.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  12. @liewegas

    ceph: clear dir complete on d_move

    liewegas authored
    d_move() reorders the d_subdirs list, breaking the readdir result caching.
    Unless/until d_move preserves that ordering, clear CEPH_I_COMPLETE on
    rename.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  13. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.
  14. @konis @torvalds

    nilfs2: fix sync silent failure

    konis authored torvalds committed
    As of 32a88aa, __sync_filesystem() will return 0 if s_bdi is not set.
    And nilfs does not set s_bdi anywhere.  I noticed this problem by the
    warning introduced by the recent commit 5129a46 ("Catch filesystem
    lacking s_bdi").
    
     WARNING: at fs/super.c:959 vfs_kern_mount+0xc5/0x14e()
     Hardware name: PowerEdge 2850
     Modules linked in: nilfs2 loop tpm_tis tpm tpm_bios video shpchp pci_hotplug output dcdbas
     Pid: 3773, comm: mount.nilfs2 Not tainted 2.6.34-rc6-debug #38
     Call Trace:
      [<c1028422>] warn_slowpath_common+0x60/0x90
      [<c102845f>] warn_slowpath_null+0xd/0x10
      [<c1095936>] vfs_kern_mount+0xc5/0x14e
      [<c1095a03>] do_kern_mount+0x32/0xbd
      [<c10a811e>] do_mount+0x671/0x6d0
      [<c1073794>] ? __get_free_pages+0x1f/0x21
      [<c10a684f>] ? copy_mount_options+0x2b/0xe2
      [<c107b634>] ? strndup_user+0x48/0x67
      [<c10a81de>] sys_mount+0x61/0x8f
      [<c100280c>] sysenter_do_call+0x12/0x32
    
    This ensures to set s_bdi for nilfs and fixes the sync silent failure.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    Acked-by: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. powernow-k8: Fix frequency reporting

    Mark Langsdorf authored Ingo Molnar committed
    With F10, model 10, all valid frequencies are in the ACPI _PST table.
    
    Cc: <stable@kernel.org> # 33.x 32.x
    Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
    LKML-Reference: <1270065406-1814-6-git-send-email-bp@amd64.org>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Reviewed-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  16. watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC s…

    Wim Van Sebroeck authored
    …tring.
    
    The WATCHDOG_TIMEOUT macro does not exist. The default timeout value is WDT_TIMEOUT.
    Fix the MODULE_PARM_DESC so that the code can compile again.
    
    reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  17. x86: Fix parse_reservetop() build failure on certain configs

    Ingo Molnar authored
    Commit e67a807 ("x86: Fix 'reservetop=' functionality") added a
    fixup_early_ioremap() call to parse_reservetop() and declared it
    in io.h.
    
    But asm/io.h was only included indirectly - and on some configs
    not at all, causing a build failure on those configs.
    
    Cc: Liang Li <liang.li@windriver.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Cc: Wang Chen <wangchen@cn.fujitsu.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    LKML-Reference: <1272621711-8683-1-git-send-email-liang.li@windriver.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
Commits on May 1, 2010
  1. perf: Fix resource leak in failure path of perf_event_open()

    Tejun Heo authored Ingo Molnar committed
    perf_event_open() kfrees event after init failure which doesn't
    release all resources allocated by perf_event_alloc().  Use
    free_event() instead.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Paul Mackerras <paulus@au1.ibm.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: <stable@kernel.org>
    LKML-Reference: <4BDBE237.1040809@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
Commits on Apr 30, 2010
  1. @prarit

    x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests

    prarit authored H. Peter Anvin committed
    Upstream PV guests fail to boot because of a NULL pointer in
    irq_force_complete_move().  It is possible that xen guests have
    irq_desc->chip_data = NULL.
    
    Test for NULL chip_data pointer before attempting to complete an irq move.
    
    Signed-off-by: Prarit Bhargava <prarit@redhat.com>
    LKML-Reference: <20100427152434.16193.49104.sendpatchset@prarit.bos.redhat.com>
    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: <stable@kernel.org> [2.6.33]
Something went wrong with that request. Please try again.