Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 22, 2010
  1. @torvalds

    Linux 2.6.35-rc6

    torvalds authored
  2. @torvalds

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

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: synaptics - relax capability ID checks on newer hardware
      Input: twl40300-keypad - fix handling of "all ground" rows
      Input: gamecon - reference correct pad in gc_psx_command()
      Input: gamecon - reference correct input device in NES mode
      Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi'
      Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table
      Input: qt2160 - rename kconfig symbol name
  3. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: add quirk to make HP DV5000 laptop resume
      drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
      Fix ttm_page_alloc.c build breakage
      drm/radeon/kms: fix legacy LVDS dpms sequence
      drm/radeon/kms: drop taking lock around crtc lookup.
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: talitos - fix bug in sg_copy_end_to_buffer
  5. @torvalds

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

    torvalds authored
    …/kernel/git/frob/linux-2.6-roland
    
    * 'x86/auditsyscall' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
      x86: auditsyscall: fix fastpath return value after reschedule
  6. @torvalds

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

    torvalds authored
    …/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function
      debug_core,kdb: fix kgdb_connected bit set in the wrong place
      Fix merge regression from external kdb to upstream kdb
      repair gdbstub to match the gdbserial protocol specification
      kdb: break out of kdb_ll() when command is terminated
  7. @torvalds

    CIFS: Fix a malicious redirect problem in the DNS lookup code

    David Howells authored torvalds committed
    Fix the security problem in the CIFS filesystem DNS lookup code in which a
    malicious redirect could be installed by a random user by simply adding a
    result record into one of their keyrings with add_key() and then invoking a
    CIFS CFS lookup [CVE-2010-2524].
    
    This is done by creating an internal keyring specifically for the caching of
    DNS lookups.  To enforce the use of this keyring, the module init routine
    creates a set of override credentials with the keyring installed as the thread
    keyring and instructs request_key() to only install lookup result keys in that
    keyring.
    
    The override is then applied around the call to request_key().
    
    This has some additional benefits when a kernel service uses this module to
    request a key:
    
     (1) The result keys are owned by root, not the user that caused the lookup.
    
     (2) The result keys don't pop up in the user's keyrings.
    
     (3) The result keys don't come out of the quota of the user that caused the
         lookup.
    
    The keyring can be viewed as root by doing cat /proc/keys:
    
    2a0ca6c3 I-----     1 perm 1f030000     0     0 keyring   .dns_resolver: 1/4
    
    It can then be listed with 'keyctl list' by root.
    
    	# keyctl list 0x2a0ca6c3
    	1 key in keyring:
    	726766307: --alswrv     0     0 dns_resolver: foo.bar.com
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Reviewed-and-Tested-by: Jeff Layton <jlayton@redhat.com>
    Acked-by: Steve French <smfrench@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. drm/radeon/kms: add quirk to make HP DV5000 laptop resume

    Alex Deucher authored Dave Airlie committed
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=29062
    
    Reported-by:  Andres Cimmarusti <acimmarusti@gmail.com>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  9. @dtor

    Input: synaptics - relax capability ID checks on newer hardware

    dtor authored
    Older firmwares fixed the middle byte of the Synaptics capabilities
    query to 0x47, but starting with firmware 7.5 the middle byte
    represents submodel ID, sometimes also called "dash number".
    
    Reported-and-tested-by: Miroslav Šulc <fordfrog@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  10. x86: auditsyscall: fix fastpath return value after reschedule

    Roland McGrath authored
    In the CONFIG_AUDITSYSCALL fast-path for x86 64-bit system calls,
    we can pass a bad return value and/or error indication for the
    system call to audit_syscall_exit().  This happens when
    TIF_NEED_RESCHED was set as the system call returned, so we went
    out to schedule() and came back to the exit-audit fast-path.  The
    fix is to reload the user return value register from the pt_regs
    before using it for audit_syscall_exit().
    
    Both the 32-bit kernel's fast path and the 64-bit kernel's 32-bit
    system call fast paths work slightly differently, so that they
    always leave the fast path entirely to reschedule and don't return
    there, so they don't have the analogous bugs.
    
    Reported-by: Alexander Viro <aviro@redhat.com>
    Signed-off-by: Roland McGrath <roland@redhat.com>
  11. @jwessel

    sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function

    jwessel authored
    The kdb code should not toggle the sysrq state in case an end user
    wants to try and resume the normal kernel execution.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  12. @jwessel

    debug_core,kdb: fix kgdb_connected bit set in the wrong place

    jwessel authored
    Immediately following an exit from the kdb shell the kgdb_connected
    variable should be set to zero, unless there are breakpoints planted.
    If the kgdb_connected variable is not zeroed out with kdb, it is
    impossible to turn off kdb.
    
    This patch is merely a work around for now, the real fix will check
    for the breakpoints.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  13. @jwessel

    Fix merge regression from external kdb to upstream kdb

    jwessel authored
    In the process of merging kdb to the mainline, the kdb lsmod command
    stopped printing the base load address of kernel modules.  This is
    needed for using kdb in conjunction with external tools such as gdb.
    
    Simply restore the functionality by adding a kdb_printf for the base
    load address of the kernel modules.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  14. @jwessel

    repair gdbstub to match the gdbserial protocol specification

    jwessel authored
    The gdbserial protocol handler should return an empty packet instead
    of an error string when ever it responds to a command it does not
    implement.
    
    The problem cases come from a debugger client sending
    qTBuffer, qTStatus, qSearch, qSupported.
    
    The incorrect response from the gdbstub leads the debugger clients to
    not function correctly.  Recent versions of gdb will not detach correctly as a result of this behavior.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Signed-off-by: Dongdong Deng <dongdong.deng@windriver.com>
  15. @jwessel

    kdb: break out of kdb_ll() when command is terminated

    Martin Hicks authored jwessel committed
    Without this patch the "ll" linked-list traversal command won't
    terminate when you hit q/Q.
    
    Signed-off-by: Martin Hicks <mort@sgi.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  16. drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl

    Alex Deucher authored Dave Airlie committed
    Return the crtc_id, not the counter value.  They are not
    necessarily the same.
    
    Cc: Jerome Glisse <glisse@freedesktop.org>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  17. Fix ttm_page_alloc.c build breakage

    Luck, Tony authored Dave Airlie committed
    The commit 1e8655f
        drm/ttm: Fix build on architectures without AGP
    
    looks at TTM_HAS_AGP before it has been set in ttm_bo_driver.h
    
    Move the conditional inclusion of <asm/agp.h> *after* we have included
    ttm_bo_driver.h
    
    Signed-of-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  18. drm/radeon/kms: fix legacy LVDS dpms sequence

    Alex Deucher authored Dave Airlie committed
    Add delay after turning off the LVDS encoder.
    
    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=16389
    
    Tested-by: Jan Kreuzer <kontrollator@gmx.de>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Jul 21, 2010
  1. drm/radeon/kms: drop taking lock around crtc lookup.

    Dave Airlie authored
    We only add/remove crtcs at driver load, you cannot remove when
    the GPU is running a CS packet since the fd is open, when
    GPU hotplugging on radeons actually is needed all this locking
    needs a review and I've started re-working kms core locking to deal
    with this better. But for now avoid long delays in CS processing when
    hotplug detect is happening in a different thread.
    
    this fixes a regression introduced with hotplug detection.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  2. @torvalds

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

    torvalds authored
    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: fix 'driver ... did not release config properly' warning
  3. @torvalds

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

    torvalds authored
    …git/dgc/xfsdev
    
    * 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
      mm: add context argument to shrinker callback to remaining shrinkers
  4. @torvalds

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

    torvalds authored
    …git/tiwai/sound-2.6
    
    * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: Select wm_hubs automatically for WM8994
      ASoC: Remove duplicate AUX definition from WM8776
      ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register
      ASoC: wm8727: add a missing return in wm8727_platform_probe
      ASoC: fsi: fixup wrong value setting order of TDM
      ASoC: fsi: fixup clock inversion operation
  5. @torvalds

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

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      math-emu: correct test for downshifting fraction in _FP_FROM_INT()
      perf: Add DWARF register lookup for sparc
      MAINTAINERS: Add SBUS driver path to sparc entry.
      drivers/sbus: Remove unnecessary casts of private_data
      sparc: remove homegrown L1_CACHE_ALIGN macro
      sparc64: fix the build error due to smp_kgdb_capture_client()
      sparc64: Fix maybe_change_configuration() PCR setting.
      arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference
      sparc64: Update defconfig.
      sunsu: Fix use after free in su_remove().
      sunserial: Don't call add_preferred_console() when console= is specified.
      sparc32: Kill none_mask, it's bogus.
  6. @torvalds

    Fix up trivial spelling errors ('taht' -> 'that')

    torvalds authored
    Pointed out by Lucas who found the new one in a comment in
    setup_percpu.c. And then I fixed the others that I grepped
    for.
    
    Reported-by: Lucas <canolucas@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @kaber

    pcmcia: fix 'driver ... did not release config properly' warning

    kaber authored Dominik Brodowski committed
    Up to 2.6.34 pcmcia_release_irq() reset p_dev->_irq to 0 after releasing
    the irq.  The IRQ is now released in pcmcia_disable_device(), however
    p_dev->_irq is not reset, triggering a warning in pcmcia_device_remove().
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  8. @dchinner

    mm: add context argument to shrinker callback to remaining shrinkers

    Dave Chinner authored dchinner committed
    Add the shrinkers missed in the first conversion of the API in
    commit 7f8275d ("mm: add context argument to
    shrinker callback").
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
  9. @dtor

    Input: twl40300-keypad - fix handling of "all ground" rows

    dtor authored
    The Nokia RX51 board code (arch/arm/mach-omap2/board-rx51-peripherals.c)
    defines a key map for the matrix keypad keyboard. The hardware seems to
    use all of the 8 rows and 8 columns of the keypad, although not all
    possible locations are used.
    
    The TWL4030 supports keypads with at most 8 rows and 8 columns. Most keys
    are defined with a row and column number between 0 and 7, except
    
            KEY(0xff, 2, KEY_F9),
            KEY(0xff, 4, KEY_F10),
            KEY(0xff, 5, KEY_F11),
    
    which represent keycodes that should be emitted when entire row is
    connected to the ground.  since the driver handles this case as if we
    had an extra column in the key matrix. Unfortunately we do not allocate
    enough space and end up owerwriting some random memory.
    
    Reported-and-tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  10. @dtor

    Input: gamecon - reference correct pad in gc_psx_command()

    dtor authored
    Otherwise we won't see any events from the gamepad.
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16408
    
    Reported-and-tested-by: Eugene Yudin <eugene.yudin@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  11. @dtor

    Input: gamecon - reference correct input device in NES mode

    dtor authored
    We moved input devices from 'struct gc' to individial pads (struct
    gc-pad), but gc_nes_process_packet() was still trying to use old
    ones and crashing.
    
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  12. @davem330

    math-emu: correct test for downshifting fraction in _FP_FROM_INT()

    Mikael Pettersson authored davem330 committed
    The kernel's math-emu code contains a macro _FP_FROM_INT() which is
    used to convert an integer to a raw normalized floating-point value.
    It does this basically in three steps:
    
    1. Compute the exponent from the number of leading zero bits.
    2. Downshift large fractions to put the MSB in the right position
       for normalized fractions.
    3. Upshift small fractions to put the MSB in the right position.
    
    There is an boundary error in step 2, causing a fraction with its
    MSB exactly one bit above the normalized MSB position to not be
    downshifted.  This results in a non-normalized raw float, which when
    packed becomes a massively inaccurate representation for that input.
    
    The impact of this depends on a number of arch-specific factors,
    but it is known to have broken emulation of FXTOD instructions
    on UltraSPARC III, which was originally reported as GCC bug 44631
    <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44631>.
    
    Any arch which uses math-emu to emulate conversions from integers to
    same-size floats may be affected.
    
    The fix is simple: the exponent comparison used to determine if the
    fraction should be downshifted must be "<=" not "<".
    
    I'm sending a kernel module to test this as a reply to this message.
    There are also SPARC user-space test cases in the GCC bug entry.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/r600: fix possible NULL pointer derefernce
      drm/radeon/kms: add quirk for ASUS HD 3600 board
      include/linux/vgaarb.h: add missing part of include guard
      drm/nouveau: Fix crashes during fbcon init on single head cards.
      drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch
      drm/radeon/kms: fix shared ddc harder
      drm/i915: enable low power render writes on GEN3 hardware.
      drm/i915: Define MI_ARB_STATE bits
      vmwgfx: return -EFAULT if copy_to_user fails
      fb: handle allocation failure in alloc_apertures()
      drm: radeon: check kzalloc() result
      drm/ttm: Fix build on architectures without AGP
      drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics
      drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740
      drm/radeon/kms: fix legacy tv-out pal mode
  14. drm/r600: fix possible NULL pointer derefernce

    Alex Deucher authored Dave Airlie committed
    Reported-by: Alexander Y. Fomichev <git.user@gmail.com>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Jul 20, 2010
  1. drm/radeon/kms: add quirk for ASUS HD 3600 board

    Alex Deucher authored Dave Airlie committed
    Connector is actually DVI rather than HDMI.
    
    Reported-by: trapDoor <trapdoor6@gmail.com>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  2. @cardoe

    include/linux/vgaarb.h: add missing part of include guard

    cardoe authored Dave Airlie committed
    vgaarb.h was missing the #define of the #ifndef at the top for the guard
    to prevent multiple #include's from causing re-define errors
    
    Signed-off-by: Doug Goldstein <cardoe@gentoo.org>
    Cc: Dave Airlie <airlied@redhat.com>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  3. @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: do not include cap/dentry releases in replayed messages
      ceph: reuse request message when replaying against recovering mds
      ceph: fix creation of ipv6 sockets
      ceph: fix parsing of ipv6 addresses
      ceph: fix printing of ipv6 addrs
      ceph: add kfree() to error path
      ceph: fix leak of mon authorizer
      ceph: fix message revocation
Something went wrong with that request. Please try again.