1. 13 4月, 2012 7 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 778c2dee
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Mostly exynos and intel.
      
        Intel has 3 regression fixers (more info in intel merge commit), along
        with some other make hw work fixes, exynos has some cleanups and an
        ioctl fix.
      
        A couple of radeon fixes, couple of build fixes, and a savage
        userspace interface possible overflow fix."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (23 commits)
        drm/exynos: fixed exynos broken ioctl
        drm/i915: clear fencing tracking state when retiring requests
        drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
        drm/exynos: fix struct for operation callback functions to driver name
        drm/exynos: use define instead of default_win member in struct mixer_context
        drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
        drm/exynos: remove unused codes in hdmi and mixer
        drm/exynos: remove unnecessary type conversion of hdmi and mixer
        drm/i915: make rc6 module parameter read-only
        drm/i915: implement ColorBlt w/a
        drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
        Revert "drm/i915: reenable gmbus on gen3+ again"
        drm/radeon: only add the mm i2c bus if the hw_i2c module param is set
        vgaarb.h: fix build warnings
        drm/i915: properly compute dp dithering for user-created modes
        drm/radeon/kms: fix DVO setup on some r4xx chips
        drm/savage: fix integer overflows in savage_bci_cmdbuf()
        drm/radeon: replace udelay with mdelay for long timeouts
        drm/i915: Finish any pending operations on the framebuffer before disabling
        drm/i915: Removed IVB forced enable of sprite dest key.
        ...
      778c2dee
    • L
      Merge tag 'md-3.4-fixes' of git://neil.brown.name/md · e42bd6e4
      Linus Torvalds 提交于
      Pull a few more fixes for md from NeilBrown:
       "Two are tagged for -stable.  They can cause an oops, but very rarely."
      
      * tag 'md-3.4-fixes' of git://neil.brown.name/md:
        md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
        md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.
        MD: Bitmap version cleanup.
      e42bd6e4
    • L
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 7e066489
      Linus Torvalds 提交于
      Pull irqdomain bug fixes from Grant Likely:
       "This branch fixes a bug in irq_create_mapping() where an error return
        from irq_alloc_desc_from() gets ignored.
      
        It also removes irq_virq_count to fix a bug on powerpc where the
        irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS
        boundary.
      
        The remaining patches get rid of an completely pointless export and
        fix some minor bugs in the irqdomain debug output."
      
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        irq_domain: Move irq_virq_count into NOMAP revmap
        irqdomain: Fix debugfs formatting
        irq_domain: correct the debugfs file name
        irq: Kill pointless irqd_to_hw export
        irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().
      7e066489
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4abb663b
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "Just a few small fixes..."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: da9052 - fix memory leak in da9052_onkey_probe()
        Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h
        Input: trackpoint - use psmouse_fmt() for messages
        Input: elantech - v4 is a clickpad, with only one button
        Input: elantech - reset touchpad before configuring it
        Input: sentelic - filter taps in absolute mode
        Input: tps6507x-ts - fix MODULE_ALIAS to match driver name
      4abb663b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 5ba7026b
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro:
       "Regression fix in mtdchar_open(), fix for a really old leak
        (almost never hit in practice - it's a b0rken failure exit in
        simple_fill_super()) and a typo fix in vfs.txt (misspelled
        method type)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        typo fix in Documentation/filesystems/vfs.txt
        dentry leak in simple_fill_super() failure exit
        fix breakage in mtdchar_open(), sanitize failure exits
      5ba7026b
    • D
      Merge branch 'exynos-drm-fixes' of... · 173fa4ec
      Dave Airlie 提交于
      Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
      
      * 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
        drm/exynos: fixed exynos broken ioctl
        drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
        drm/exynos: fix struct for operation callback functions to driver name
        drm/exynos: use define instead of default_win member in struct mixer_context
        drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
        drm/exynos: remove unused codes in hdmi and mixer
        drm/exynos: remove unnecessary type conversion of hdmi and mixer
        drm/exynos: add format list of plane
        drm/exynos: fixed duplicated page allocation bug.
        drm/exynos: fixed page align and code clean.
      173fa4ec
    • D
      Merge branch 'drm-intel-fixes' of... · 19e5c4e7
      Dave Airlie 提交于
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes
      
      Daniel Vetter writes:
      3 regression fixes:
      - disable gmbus again, too broken for 3.4, we'll try again for 3.5
      - dp bandwidth computation fix, we've lost the 6bpc dithering flag
       sometimes, this is a 3.3 regression (maybe even earlier for some
       configurations).
      - fix resume regression caused by the gen2/3 fencing fix merged into -rc2.
      
      And a few other fixes:
      - gpu hang fix for i845 (Chris)
      - sprite fix (Armin Reese)
      - crtc disable vs. scanlinewait race fix (Chris)
      - rc6 module option read-only, it confused testers (Jesse)
      - fbc related blitter death hw workaround, note that we disable fbc on snb
       by default anyway.
      
      With these fixes we have one 3.4 regression outstanding: One of the
      cleanup patches for the interlaced support managed to confuse the lvds
      panel fitter when upscaling. The root-cause is still unclear, but test
      patches are awaiting feedback from the reporter.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: clear fencing tracking state when retiring requests
        drm/i915: make rc6 module parameter read-only
        drm/i915: implement ColorBlt w/a
        drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
        Revert "drm/i915: reenable gmbus on gen3+ again"
        drm/i915: properly compute dp dithering for user-created modes
        drm/i915: Finish any pending operations on the framebuffer before disabling
        drm/i915: Removed IVB forced enable of sprite dest key.
      19e5c4e7
  2. 12 4月, 2012 22 次提交
  3. 11 4月, 2012 11 次提交