Permalink
Switch branches/tags
Commits on May 10, 2011
  1. Linux 2.6.39-rc7

    torvalds committed May 10, 2011
  2. vm: fix vm_pgoff wrap in upward expansion

    Hugh Dickins committed with torvalds May 10, 2011
    Commit a626ca6 ("vm: fix vm_pgoff wrap in stack expansion") fixed
    the case of an expanding mapping causing vm_pgoff wrapping when you had
    downward stack expansion.  But there was another case where IA64 and
    PA-RISC expand mappings: upward expansion.
    
    This fixes that case too.
    
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on May 9, 2011
  1. Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/…

    torvalds committed May 9, 2011
    …kernel/git/keithp/linux-2.6
    
    * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
      drm/i915/lvds: Only act on lid notify when the device is on
      drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"
      drm/i915: Only enable the plane after setting the fb base (pre-ILK)
      drm/i915/dp: Be paranoid in case we disable a DP before it is attached
      drm/i915: Release object along create user fb error path
  2. Don't lock guardpage if the stack is growing up

    Mikulas Patocka committed with torvalds May 9, 2011
    Linux kernel excludes guard page when performing mlock on a VMA with
    down-growing stack. However, some architectures have up-growing stack
    and locking the guard page should be excluded in this case too.
    
    This patch fixes lvm2 on PA-RISC (and possibly other architectures with
    up-growing stack). lvm2 calculates number of used pages when locking and
    when unlocking and reports an internal error if the numbers mismatch.
    
    [ Patch changed fairly extensively to also fix /proc/<pid>/maps for the
      grows-up case, and to move things around a bit to clean it all up and
      share the infrstructure with the /proc bits.
    
      Tested on ia64 that has both grow-up and grow-down segments  - Linus ]
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Tested-by: Tony Luck <tony.luck@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 9, 2011
    …/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
      eeepc-laptop: Use ACPI handle to identify rfkill port
      [PATCH] sony-laptop: limit brightness range to DSDT provided ones
      sony-laptop: report failures on setting LCD brightness
      thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
  4. drm/i915/lvds: Only act on lid notify when the device is on

    awilliam committed with keith-packard Apr 21, 2011
    If we're using vga switcheroo, the device may be turned off
    and poking it can return random state. This provokes an OOPS fixed
    separately by 8ff887c847 (drm/i915/dp: Be paranoid in case we disable a
    DP before it is attached). Trying to use and respond to events on a
    device that has been turned off by the user is in principle a silly thing
    to do.
    
    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: stable@kernel.org
    Signed-off-by: Keith Packard <keithp@keithp.com>
  5. drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"

    ickle committed with keith-packard Apr 22, 2011
    Despite the fixes in 548f245 (drm/i915: fix per-pipe reads after
    "cleanup"), we missed one neighbouring read that was mistakenly replaced
    with the reg value in 9db4a9c (drm/i915: cleanup per-pipe reg usage).
    This was preventing us from correctly determining the mode the BIOS left
    the panel in for machines that neither have an OpRegion nor access to
    the VBT, (e.g. the EeePC 700).
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: stable@kernel.org
    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Keith Packard <keithp@keithp.com>
  6. drm/i915: Only enable the plane after setting the fb base (pre-ILK)

    ickle committed with keith-packard Apr 19, 2011
    When enabling the plane, it is helpful to have already pointed that
    plane to valid memory or else we may incur the wrath of a PGTBL_ER.
    This code preserved the behaviour from the bad old days for unknown
    reasons...
    
    Found by assert_fb_bound_for_plane().
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=36246
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Keith Packard <keithp@keithp.com>
  7. Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds committed May 9, 2011
    …git/tiwai/sound-2.6
    
    * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: Fix CODEC DAI names for Goni
      ASoC: Fix CODEC name in Goni
      davinci-mcasp: fix _CBM_CFS pin directions
      davinci-mcasp: fix _CBM_CFS hw_params
      davinci-mcasp: use bitfield definitions for PDIR
      ASoC: davinci-mcasp: correct tdm_slots limit
  8. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 9, 2011
    …/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 pci id to acer travelmate quirk for 5730
      drm/radeon: fix order of doing things in radeon_crtc_cursor_set
      drm: mm: fix debug output
      drm/radeon/kms: ATPX switcheroo fixes
      drm/nouveau: Fix a crash at card takedown for NV40 and older cards
  9. Merge branch 'hpfs'

    torvalds committed May 9, 2011
    * hpfs:
      HPFS: Remove unused variable
      HPFS: Move declaration up, so that there are no out-of-scope pointers
      HPFS: Fix some unaligned accesses
      HPFS: Fix endianity. Make hpfs work on big-endian machines
      HPFS: Implement fsync for hpfs
      HPFS: Fix a bug that filesystem was not marked dirty when remounting it
      HPFS: Restrict uid and gid to 16-bit values
      HPFS: When marking or clearing the dirty bit, sync the filesystem
      HPFS: Use types with defined width
      HPFS: Remove mark_inode_dirty
      HPFS: Remove CR/LF conversion option
      HPFS: Remove remaining locks
      HPFS: Introduce a global mutex and lock it on every callback from VFS.
      HPFS: Make HPFS compile on preempt and SMP
  10. HPFS: Remove unused variable

    Mikulas Patocka committed with torvalds May 8, 2011
    Remove unused variable
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. HPFS: Move declaration up, so that there are no out-of-scope pointers

    Mikulas Patocka committed with torvalds May 8, 2011
    Move declaration up, so that there are no out-of-scope pointers
    
    Reported-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. HPFS: Fix some unaligned accesses

    Mikulas Patocka committed with torvalds May 8, 2011
    Fix some unaligned accesses
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. HPFS: Fix endianity. Make hpfs work on big-endian machines

    Mikulas Patocka committed with torvalds May 8, 2011
    Fix endianity. Make hpfs work on big-endian machines.
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. HPFS: Implement fsync for hpfs

    Mikulas Patocka committed with torvalds May 8, 2011
    Implement fsync for hpfs.
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. HPFS: Fix a bug that filesystem was not marked dirty when remounting it

    Mikulas Patocka committed with torvalds May 8, 2011
    Fix a bug that filesystem was not marked dirty when remounting it
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. HPFS: Restrict uid and gid to 16-bit values

    Mikulas Patocka committed with torvalds May 8, 2011
    Restrict uid and gid to 16-bit values.
    
    HPFS stores only 2 bytes in the EAs.
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. HPFS: When marking or clearing the dirty bit, sync the filesystem

    Mikulas Patocka committed with torvalds May 8, 2011
    When marking or clearing the dirty bit, sync the filesystem
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. HPFS: Use types with defined width

    Mikulas Patocka committed with torvalds May 8, 2011
    Use types with defined width
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. HPFS: Remove mark_inode_dirty

    Mikulas Patocka committed with torvalds May 8, 2011
    Remove mark_inode_dirty
    
    HPFS doesn't use kernel's dirty inode indicator anyway because
    writing an inode requires directory's mutex.
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. HPFS: Remove CR/LF conversion option

    Mikulas Patocka committed with torvalds May 8, 2011
    Remove CR/LF conversion option
    
    It is unused anyway. It was used on 2.2 kernels or so.
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. HPFS: Remove remaining locks

    Mikulas Patocka committed with torvalds May 8, 2011
    Remove remaining locks
    
    Because of a new global per-fs lock, no other locks are needed
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. HPFS: Introduce a global mutex and lock it on every callback from VFS.

    Mikulas Patocka committed with torvalds May 8, 2011
    Introduce a global mutex and lock it on every callback from VFS.
    
    Performance doesn't matter, reviewing the whole code for locking correctness
    would be too complicated, so simply lock it all.
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. HPFS: Make HPFS compile on preempt and SMP

    Mikulas Patocka committed with torvalds May 8, 2011
    Make HPFS compile on preempt and SMP
    
    Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. eeepc-laptop: Use ACPI handle to identify rfkill port

    Matthew Garrett committed May 9, 2011
    The ACPI notification we get from rfkill events on these machines gives
    us all the information we need to identify the port that's changed. Do
    so rather than assuming that it's always bus 1.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  25. [PATCH] sony-laptop: limit brightness range to DSDT provided ones

    malattia committed with Matthew Garrett May 9, 2011
    The new style brightness control provides an operating range of 9 values
    (seems consistent over a large number of models sharing the same
    brightness control methods).
    Read and use the minimum and maximum values to limit the backlight
    interface between those boundaries.
    
    Signed-off-by: Mattia Dongili <malattia@linux.it>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  26. sony-laptop: report failures on setting LCD brightness

    malattia committed with Matthew Garrett Apr 5, 2011
    Check if we were successful in setting the requested brightness and
    report failure in that case.
    
    Signed-off-by: Mattia Dongili <malattia@linux.it>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  27. thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.

    Manoj Iyer committed with Matthew Garrett May 8, 2011
    The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead
    of IBM0068. Added new HID so that thinkpad_acpi module will
    auto load on these newer Lenovo ThinkPads.
    
    Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    Cc: stable@kernel.org
    Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
    Signed-off-by: Andy Lutomirski <luto@mit.edu>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
Commits on May 8, 2011
  1. drm/radeon/kms: add pci id to acer travelmate quirk for 5730

    Alex Deucher committed with Dave Airlie May 4, 2011
    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=34082
    
    Reported by: Sampo Laaksonen <zhamahn@gmail.com>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  2. drm/radeon: fix order of doing things in radeon_crtc_cursor_set

    Ilija Hadzic committed with Dave Airlie May 5, 2011
     if object pin or object lookup in radeon_cursor_set fail, the function
     could leave inconsistent mouse width and hight values in radeon_crtc
     fixed by moving cursor width and height assignments after all
     checks have passed
    
    Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  3. drm: mm: fix debug output

    danvet committed with Dave Airlie May 6, 2011
    The looping helper didn't do anything due to a superficial
    semicolon. Furthermore one of the two dump functions suffered
    from copy&paste fail.
    
    While staring at the code I've also noticed that the replace
    helper (currently unused) is a bit broken.
    
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  4. Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouve…

    Dave Airlie committed May 8, 2011
    …au-next into drm-fixes
    
    * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
      drm/nouveau: Fix a crash at card takedown for NV40 and older cards
  5. drm/radeon/kms: ATPX switcheroo fixes

    Alex Deucher committed with Dave Airlie May 6, 2011
    When we switch the display mux, also switch
    the i2c mux.  Also use the start and finish
    methods to let the sbios know that the switch
    is happening.
    
    Should fix:
    https://bugs.freedesktop.org/show_bug.cgi?id=35398
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  6. drm/nouveau: Fix a crash at card takedown for NV40 and older cards

    Jimmy Rentz committed with skeggsb Apr 17, 2011
    NV40 and older cards (pre NV50) reserve a vram bo for the vga memory at
    card init. This bo is then freed at card shutdown.  The problem is that
    the ttm bo vram manager was already freed. So a crash occurs when the
    vga bo is freed. The fix is to free the vga bo prior to freeing the ttm
    bo vram manager. There might be other solutions but this seemed the
    simplest to me.
    
    Signed-off-by: Jimmy Rentz <jb17bsome@gmail.com>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>