1. 02 3月, 2012 2 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · cfa5555c
      Linus Torvalds 提交于
      DRM fixes from Dave Airlie:
        intel: fixes for output regression on 965GM, an oops and a machine
        hang
      
        radeon: uninitialised var (that gcc didn't warn about for some reason)
        + a couple of correctness fixes.
      
        exynos: fixes for various things, drop some chunks of unused code.
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon/kms/vm: fix possible bug in radeon_vm_bo_rmv()
        drm/radeon: fix uninitialized variable
        drm/radeon/kms: fix radeon_dp_get_modes for LVDS bridges (v2)
        drm/i915: Remove use of the autoreported ringbuffer HEAD position
        drm/i915: Prevent a machine hang by checking crtc->active before loading lut
        drm/i915: fix operator precedence when enabling RC6p
        drm/i915: fix a sprite watermark computation to avoid divide by zero if xpos<0
        drm/i915: fix mode set on load pipe. (v2)
        drm/exynos: exynos_drm.h header file fixes
        drm/exynos: added panel physical size.
        drm/exynos: added postclose to release resource.
        drm/exynos: removed exynos_drm_fbdev_recreate function.
        drm/exynos: fixed page flip issue.
        drm/exynos: added possible_clones setup function.
        drm/exynos: removed pageflip_event_list init code when closed.
        drm/exynos: changed priority of mixer layers.
        drm/exynos: Fix typo in exynos_mixer.c
      cfa5555c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 6bba07c6
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        [S390] memory hotplug: prevent memory zone interleave
        [S390] crash_dump: remove duplicate include
        [S390] KEYS: Enable the compat keyctl wrapper on s390x
      6bba07c6
  2. 01 3月, 2012 5 次提交
    • L
      Merge tag 'for-linus' of git://github.com/rustyrussell/linux · d7e53922
      Linus Torvalds 提交于
      Merge virtio pull request from Rusty Russell.
      
      * tag 'for-linus' of git://github.com/rustyrussell/linux:
        virtio: balloon: leak / fill balloon across S4
      d7e53922
    • A
      virtio: balloon: leak / fill balloon across S4 · 4eb05d56
      Amit Shah 提交于
      commit e562966d added support for S4 to
      the balloon driver.  The freeze function did nothing to free the pages,
      since reclaiming the pages from the host to immediately give them back
      (if S4 was successful) seemed wasteful.  Also, if S4 wasn't successful,
      the guest would have to re-fill the balloon.  On restore, the pages were
      supposed to be marked freed and the free page counters were incremented
      to reflect the balloon was totally deflated.
      
      However, this wasn't done right.  The pages that were earlier taken away
      from the guest during a balloon inflation operation were just shown as
      used pages after a successful restore from S4.  Just a fancy way of
      leaking lots of memory.
      
      Instead of trying that, just leak the balloon on freeze and fill it on
      restore/thaw paths.  This works properly now.  The optimisation to not
      leak can be added later on after a bit of refactoring of the code.
      Signed-off-by: NAmit Shah <amit.shah@redhat.com>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      4eb05d56
    • L
      Merge tag 'fixes-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c5f2ac92
      Linus Torvalds 提交于
      Arnd Bergmann says:
       "Another set of arm-soc bug fixes on top of v3.3-rc5.  The few larger
        bits are all for devices that still need to get set up in board code.
      
        Only three platforms are in this set of fixes: omap2+, pxa and lpc32xx."
      
      * tag 'fixes-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
        ARM: LPC32xx: serial.c: Fixed loop limit
        ARM: LPC32xx: serial.c: HW bug workaround
        ARM: LPC32xx: irq.c: Clear latched event
        ARM: LPC32xx: Fix interrupt controller init
        ARM: LPC32xx: Fix irq on GPI_28
        ARM: OMAP2: fix mailbox init code
        ARM: OMAP2+: gpmc-smsc911x: add required smsc911x regulators
        ARM: OMAP1: Fix out-of-bounds array access for Innovator
        OMAP3 EVM: remove out-of-bounds array access of gpio_leds
        ARM: OMAP: Fix build error when mmc_omap is built as module
        ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
        pxa/hx4700: add platform device and I2C info for AK4641 codec
        arch/arm/mach-pxa/: included linux/gpio.h twice
        arch/arm/mach-mmp/: some files include some headers twice
        ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
        ARM: pxa: fix including linux/gpio.h twice
        ARM: pxa: fix mixed declarations and code in sharpsl_pm
        ARM: pxa: fix wrong parsing gpio event on spitz
        ARM: OMAP2+: usb-host: fix compile warning
        ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback
        ...
      c5f2ac92
    • L
      Merge tag 'for-3.3' of git://openrisc.net/jonas/linux · 88ebdda6
      Linus Torvalds 提交于
      Build fixes for 3.3 from Jonas Bonn
      
      * tag 'for-3.3' of git://openrisc.net/jonas/linux:
        openrisc: Fix up audit_syscall_[entry|exit]() usage
        openrisc: include export.h for EXPORT_SYMBOL
      88ebdda6
    • S
      drm/radeon/kms/vm: fix possible bug in radeon_vm_bo_rmv() · 108b0d34
      Sebastian Biemueller 提交于
      The bo is removed from the list at the top of
      radeon_vm_bo_rmv(), but then the list is used
      in radeon_vm_bo_update_pte() to look up the vm.
      remove the bo_list entry at the end of the
      function instead.
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: NJerome Glisse <j.glisse@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      108b0d34
  3. 29 2月, 2012 6 次提交
  4. 28 2月, 2012 14 次提交
  5. 27 2月, 2012 13 次提交