1. 05 Apr, 2012 37 commits
  2. 04 Apr, 2012 3 commits
    • Linus Torvalds's avatar
      Merge git://git.samba.org/sfrench/cifs-2.6 · 43f63c87
      Linus Torvalds authored
      Pull CIFS fixes from Steve French.
      * git://git.samba.org/sfrench/cifs-2.6:
        Fix UNC parsing on mount
        Remove unnecessary check for NULL in password parser
        CIFS: Fix VFS lock usage for oplocked files
        Revert "CIFS: Fix VFS lock usage for oplocked files"
        cifs: writing past end of struct in cifs_convert_address()
        cifs: silence compiler warnings showing up with gcc-4.7.0
        CIFS: Fix VFS lock usage for oplocked files
    • Linus Torvalds's avatar
      Merge tag 'for_linus-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb · 6c216ec6
      Linus Torvalds authored
      Pull KGDB/KDB regression fixes from Jason Wessel:
       - Fix a Smatch warning that appeared in the 3.4 merge window
       - Fix kgdb test suite with SMP for all archs without HW single stepping
       - Fix kgdb sw breakpoints with CONFIG_DEBUG_RODATA=y limitations on x86
       - Fix oops on kgdb test suite with CONFIG_DEBUG_RODATA
       - Fix kgdb test suite with SMP for all archs with HW single stepping
      * tag 'for_linus-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
        x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()
        kgdb,debug_core: pass the breakpoint struct instead of address and memory
        kgdbts: (2 of 2) fix single step awareness to work correctly with SMP
        kgdbts: (1 of 2) fix single step awareness to work correctly with SMP
        kgdbts: Fix kernel oops with CONFIG_DEBUG_RODATA
        kdb: Fix smatch warning on dbg_io_ops->is_console
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 58bca4a8
      Linus Torvalds authored
      Pull DMA mapping branch from Marek Szyprowski:
       "Short summary for the whole series:
        A few limitations have been identified in the current dma-mapping
        design and its implementations for various architectures.  There exist
        more than one function for allocating and freeing the buffers:
        currently these 3 are used dma_{alloc, free}_coherent,
        dma_{alloc,free}_writecombine, dma_{alloc,free}_noncoherent.
        For most of the systems these calls are almost equivalent and can be
        interchanged.  For others, especially the truly non-coherent ones
        (like ARM), the difference can be easily noticed in overall driver
        performance.  Sadly not all architectures provide implementations for
        all of them, so the drivers might need to be adapted and cannot be
        easily shared between different architectures.  The provided patches
        unify all these functions and hide the differences under the already
        existing dma attributes concept.  The thread with more references is
        available here:
        These patches are also a prerequisite for unifying DMA-mapping
        implementation on ARM architecture with the common one provided by
        dma_map_ops structure and extending it with IOMMU support.  More
        information is available in the following thread:
        More works on dma-mapping framework are planned, especially in the
        area of buffer sharing and managing the shared mappings (together with
        the recently introduced dma_buf interface: commit d15bd7ee
        "dma-buf: Introduce dma buffer sharing mechanism").
        The patches in the current set introduce a new alloc/free methods
        (with support for memory attributes) in dma_map_ops structure, which
        will later replace dma_alloc_coherent and dma_alloc_writecombine
      People finally started piping up with support for merging this, so I'm
      merging it as the last of the pending stuff from the merge window.
      Looks like pohmelfs is going to wait for 3.5 and more external support
      for merging.
      * 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        common: DMA-mapping: add NON-CONSISTENT attribute
        common: DMA-mapping: add WRITE_COMBINE attribute
        common: dma-mapping: introduce mmap method
        common: dma-mapping: remove old alloc_coherent and free_coherent methods
        Hexagon: adapt for dma_map_ops changes
        Unicore32: adapt for dma_map_ops changes
        Microblaze: adapt for dma_map_ops changes
        SH: adapt for dma_map_ops changes
        Alpha: adapt for dma_map_ops changes
        SPARC: adapt for dma_map_ops changes
        PowerPC: adapt for dma_map_ops changes
        MIPS: adapt for dma_map_ops changes
        X86 & IA64: adapt for dma_map_ops changes
        common: dma-mapping: introduce generic alloc() and free() methods