Skip to content
Snippets Groups Projects
  1. Jun 04, 2011
    • Linus Torvalds's avatar
      Revert "ASoC: Update cx20442 for TTY API change" · bb3d6bf1
      Linus Torvalds authored
      
      This reverts commit ed0bd233.
      
      Since we reverted the TTY API change, we should revert the ASoC update
      to it too.
      
      Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: Liam Girdwood <lrg@ti.com>
      Cc: Greg Kroah-Hartman <gregkh@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb3d6bf1
    • Linus Torvalds's avatar
      Revert "tty: make receive_buf() return the amout of bytes received" · 55db4c64
      Linus Torvalds authored
      This reverts commit b1c43f82.
      
      It was broken in so many ways, and results in random odd pty issues.
      
      It re-introduced the buggy schedule_work() in flush_to_ldisc() that can
      cause endless work-loops (see commit a5660b41: "tty: fix endless
      work loop when the buffer fills up").
      
      It also used an "unsigned int" return value fo the ->receive_buf()
      function, but then made multiple functions return a negative error code,
      and didn't actually check for the error in the caller.
      
      And it didn't actually work at all.  BenH bisected down odd tty behavior
      to it:
        "It looks like the patch is causing some major malfunctions of the X
         server for me, possibly related to PTYs.  For example, cat'ing a
         large file in a gnome terminal hangs the kernel for -minutes- in a
         loop of what looks like flush_to_ldisc/workqueue code, (some ftrace
         data in the quoted bits further down).
      
         ...
      
         Some more data: It -looks- li...
      55db4c64
  2. Jun 02, 2011
    • Linus Torvalds's avatar
      Revert "mm: fail GFP_DMA allocations when ZONE_DMA is not configured" · 1fa7b6a2
      Linus Torvalds authored
      
      This reverts commit a197b59a.
      
      As rmk says:
       "Commit a197b59a (mm: fail GFP_DMA allocations when ZONE_DMA is not
        configured) is causing regressions on ARM with various drivers which
        use GFP_DMA.
      
        The behaviour up until now has been to silently ignore that flag when
        CONFIG_ZONE_DMA is not enabled, and to allocate from the normal zone.
        However, as a result of the above commit, such allocations now fail
        which causes drivers to fail.  These are regressions compared to the
        previous kernel version."
      
      so just revert it.
      
      Requested-by: default avatarRussell King <linux@arm.linux.org.uk>
      Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Cc: David Rientjes <rientjes@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1fa7b6a2
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/iommu-2.6 · f0f52a94
      Linus Torvalds authored
      * git://git.infradead.org/iommu-2.6:
        intel-iommu: Fix off-by-one in RMRR setup
        intel-iommu: Add domain check in domain_remove_one_dev_info
        intel-iommu: Remove Host Bridge devices from identity mapping
        intel-iommu: Use coherent DMA mask when requested
        intel-iommu: Dont cache iova above 32bit
        intel-iommu: Speed up processing of the identity_mapping function
        intel-iommu: Check for identity mapping candidate using system dma mask
        intel-iommu: Only unlink device domains from iommu
        intel-iommu: Enable super page (2MiB, 1GiB, etc.) support
        intel-iommu: Flush unmaps at domain_exit
        intel-iommu: Remove obsolete comment from detect_intel_iommu
        intel-iommu: fix VT-d PMR disable for TXT on S3 resume
      f0f52a94
    • Linus Torvalds's avatar
      block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal · 0f48f260
      Linus Torvalds authored
      
      Jens' back-merge commit 698567f3 ("Merge commit 'v2.6.39' into
      for-2.6.40/core") was incorrectly done, and re-introduced the
      DISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits
      
       - 9fd097b1 ("block: unexport DISK_EVENT_MEDIA_CHANGE for
         legacy/fringe drivers")
      
       - 7eec77a1 ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd
         and ide-cd")
      
      because of conflicts with the "g->flags" updates near-by by commit
      d4dc210f ("block: don't block events on excl write for non-optical
      devices")
      
      As a result, we re-introduced the hanging behavior due to infinite disk
      media change reports.
      
      Tssk, tssk, people! Don't do back-merges at all, and *definitely* don't
      do them to hide merge conflicts from me - especially as I'm likely
      better at merging them than you are, since I do so many merges.
      
      Reported-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Cc: Jens Axboe <jaxboe@fusionio.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0f48f260
  3. Jun 01, 2011
  4. May 31, 2011
  5. May 30, 2011