1. 25 Oct, 2012 1 commit
    • Linus Torvalds's avatar
      Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · cff7b8ba
      Linus Torvalds authored
      Pull CMA and DMA-mapping fixes from Marek Szyprowski:
       "This consists mainly of a set of one-liner fixes and cleanups for a
        few minor issues identified in both Contiguous Memory Allocator code
        and ARM DMA-mapping subsystem."
      * 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: mm: Remove unused arm_vmregion priv field
        ARM: dma-mapping: fix build warning in __dma_alloc()
        ARM: dma-mapping: support debug_dma_mapping_error
        mm: cma: alloc_contig_range: return early for err path
        drivers: cma: Fix wrong CMA selected region size default value
        drivers: dma-coherent: Fix typo in dma_mmap_from_coherent documentation
        drivers: dma-contiguous: Don't redefine SZ_1M
  2. 24 Oct, 2012 11 commits
  3. 23 Oct, 2012 22 commits
  4. 22 Oct, 2012 6 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 2d1f4c8e
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Fixes for intel and nouveau mainly.
         - intel: disable HSW by default, sdvo fixes, link train regression
         - nouveau: acpi rom loading regression fix, with a few other fixes
           from the rework
         -core: just other minor fixes and race fixes for ttm."
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
        drm/ttm: Fix a theoretical race in ttm_bo_cleanup_refs()
        drm/ttm: Fix a theoretical race
        drm: platform: Don't initialize driver-private data
        drm/debugfs: remove redundant info from gem_names
        drm: fb: cma: Fail gracefully on allocation failure
        drm: fb: cma: Fix typo in debug message
        drm/nouveau/clock: fix missing pll type/addr when matching default entry
        drm/nouveau/fb: fix reporting of memory type on GF8+ IGPs
        drm/nv41/vm: don't init hw pciegart on boards with agp bridge
        drm/nouveau/bios: fetch full 4KiB block to determine ACPI ROM image size
        drm/nouveau: validate vbios size
        drm/nouveau: warn when trying to free mm which is still in use
        drm/nouveau: fix nouveau_mm/nouveau_mm_node leak
        drm/nouveau/bios: improve error handling when reading the vbios from ACPI
        drm/nouveau: handle same-fb page flips
        drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle()
        drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
        drm/i915: Insert i915_preliminary_hw_support variable.
        drm/i915: shut up spurious WARN in the gtt fault handler
        Revert "drm/i915: Try harder to complete DP training pattern 1"
    • Linus Torvalds's avatar
      Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy · d888af96
      Linus Torvalds authored
      Pull jfs fix from Dave Kleikamp:
       "Bug fix: Fix FITRIM argument handling"
      * tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy:
        jfs: Fix FITRIM argument handling
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · e589db7a
      Linus Torvalds authored
      Pull ext4 fixes from Ted Ts'o:
       "Various bug fixes for ext4.  The most serious of them fixes a security
        bug (CVE-2012-4508) which leads to stale data exposure when we have
        fallocate racing against writes to files undergoing delayed
        allocation.  We also have two fixes for the metadata checksum feature,
        the most serious of which can cause the superblock to have a invalid
        checksum after a power failure."
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: Avoid underflow in ext4_trim_fs()
        ext4: Checksum the block bitmap properly with bigalloc enabled
        ext4: fix undefined bit shift result in ext4_fill_flex_info
        ext4: fix metadata checksum calculation for the superblock
        ext4: race-condition protection for ext4_convert_unwritten_extents_endio
        ext4: serialize fallocate with ext4_convert_unwritten_extents
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 344ba37b
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       - Do not call pnfs_return_layout() from an rpciod context
       - nfs4_ds_disconnect can cause Oopses.  Kill it...
       - Fix the return value for nfs_callback_start_svc
       - Fix a number of compile warnings
      * tag 'nfs-for-3.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFSv4: Fix the return value for nfs_callback_start_svc
        NFSv4.1: Declare osd_pri_2_pnfs_err(), objio_init_read/write to be static
        NFSv4: fs/nfs/nfs4getroot.c needs to include "internal.h"
        NFSv4.1: Use kcalloc() to allocate zeroed arrays instead of kzalloc()
        NFSv4.1: Do not call pnfs_return_layout() from an rpciod context
        NFSv4.1: Kill nfs4_ds_disconnect()
    • Linus Torvalds's avatar
      Merge tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · c52f1dd5
      Linus Torvalds authored
      Pull regmap fix from Mark Brown:
       "regmap: Fix for dependencies for MMIO
        Trivial dependency issue, not noticed before as the only user of MMIO
        also needs I2C."
      * tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: select REGMAP if REGMAP_MMIO and REGMAP_IRQ enabled
    • Thomas Hellstrom's avatar
      drm/ttm: Fix a theoretical race in ttm_bo_cleanup_refs() · b8e902f2
      Thomas Hellstrom authored
      In theory, that function could release the lru lock between
      checking for bo on ddestroy list and a successful reserve if the bo
      was already reserved, and the function was called with waiting reserves
      However, all current reservers of a bo on the ddestroy list would
      atomically take the bo off the list after a successful reserve so this
      race should not have been hit, so no need to backport for stable.
      This patch also fixes a case found by Maarten Lankhorst where
      ttm_mem_evict_first called with no_wait_gpu would incorrectly
      spin waiting for bo idle if trying to evict a busy buffer that
      also sits on the ddestroy list.
      Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>