1. 18 Dec, 2012 33 commits
  2. 17 Dec, 2012 7 commits
    • Linus Torvalds's avatar
      Revert "bdi: add a user-tunable cpu_list for the bdi flusher threads" · 9360b536
      Linus Torvalds authored
      This reverts commit 8fa72d23.
      
      People disagree about how this should be done, so let's revert this for
      now so that nobody starts using the new tuning interface.  Tejun is
      thinking about a more generic interface for thread pool affinity.
      Requested-by: default avatarTejun Heo <tj@kernel.org>
      Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
      Acked-by: default avatarJens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9360b536
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · fa4c95bf
      Linus Torvalds authored
      Pull ext3, udf, quota fixes from Jan Kara:
       "Some ext3 & quota cleanups and couple of udf fixes"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK
        ext3: drop if around WARN_ON
        ext3: get rid of the duplicate code on ext3_fill_super
        udf: remove un-needed variable from inode_getblk
        udf: don't increment lenExtents while writing to a hole
        udf: fix memory leak while allocating blocks during write
      fa4c95bf
    • Linus Torvalds's avatar
      Merge branch 'for-3.8/core' of git://git.kernel.dk/linux-block · 60da5bf4
      Linus Torvalds authored
      Pull block layer core updates from Jens Axboe:
       "Here are the core block IO bits for 3.8.  The branch contains:
      
         - The final version of the surprise device removal fixups from Bart.
      
         - Don't hide EFI partitions under advanced partition types.  It's
           fairly wide spread these days.  This is especially dangerous for
           systems that have both msdos and efi partition tables, where you
           want to keep them in sync.
      
         - Cleanup of using -1 instead of the proper NUMA_NO_NODE
      
         - Export control of bdi flusher thread CPU mask and default to using
           the home node (if known) from Jeff.
      
         - Export unplug tracepoint for MD.
      
         - Core improvements from Shaohua.  Reinstate the recursive merge, as
           the original bug has been fixed.  Add plugging for discard and also
           fix a problem handling non pow-of-2 discard limits.
      
        There's a trivial merge in block/blk-exec.c due to a fix that went
        into 3.7-rc at a later point than -rc4 where this is based."
      
      * 'for-3.8/core' of git://git.kernel.dk/linux-block:
        block: export block_unplug tracepoint
        block: add plug for blkdev_issue_discard
        block: discard granularity might not be power of 2
        deadline: Allow 0ms deadline latency, increase the read speed
        partitions: enable EFI/GPT support by default
        bsg: Remove unused function bsg_goose_queue()
        block: Make blk_cleanup_queue() wait until request_fn finished
        block: Avoid scheduling delayed work on a dead queue
        block: Avoid that request_fn is invoked on a dead queue
        block: Let blk_drain_queue() caller obtain the queue lock
        block: Rename queue dead flag
        bdi: add a user-tunable cpu_list for the bdi flusher threads
        block: use NUMA_NO_NODE instead of -1
        block: recursive merge requests
        block CFQ: avoid moving request to different queue
      60da5bf4
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 3c2e81ef
      Linus Torvalds authored
      Pull DRM updates from Dave Airlie:
       "This is the one and only next pull for 3.8, we had a regression we
        found last week, so I was waiting for that to resolve itself, and I
        ended up with some Intel fixes on top as well.
      
        Highlights:
         - new driver: nvidia tegra 20/30/hdmi support
         - radeon: add support for previously unused DMA engines, more HDMI
           regs, eviction speeds ups and fixes
         - i915: HSW support enable, agp removal on GEN6, seqno wrapping
         - exynos: IPP subsystem support (image post proc), HDMI
         - nouveau: display class reworking, nv20->40 z compression
         - ttm: start of locking fixes, rcu usage for lookups,
         - core: documentation updates, docbook integration, monotonic clock
           usage, move from connector to object properties"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (590 commits)
        drm/exynos: add gsc ipp driver
        drm/exynos: add rotator ipp driver
        drm/exynos: add fimc ipp driver
        drm/exynos: add iommu support for ipp
        drm/exynos: add ipp subsystem
        drm/exynos: support device tree for fimd
        radeon: fix regression with eviction since evict caching changes
        drm/radeon: add more pedantic checks in the CP DMA checker
        drm/radeon: bump version for CS ioctl support for async DMA
        drm/radeon: enable the async DMA rings in the CS ioctl
        drm/radeon: add VM CS parser support for async DMA on cayman/TN/SI
        drm/radeon/kms: add evergreen/cayman CS parser for async DMA (v2)
        drm/radeon/kms: add 6xx/7xx CS parser for async DMA (v2)
        drm/radeon: fix htile buffer size computation for command stream checker
        drm/radeon: fix fence locking in the pageflip callback
        drm/radeon: make indirect register access concurrency-safe
        drm/radeon: add W|RREG32_IDX for MM_INDEX|DATA based mmio accesss
        drm/exynos: support extended screen coordinate of fimd
        drm/exynos: fix x, y coordinates for right bottom pixel
        drm/exynos: fix fb offset calculation for plane
        ...
      3c2e81ef
    • Mel Gorman's avatar
      sched: numa: Fix build error if CONFIG_NUMA_BALANCING && !CONFIG_TRANSPARENT_HUGEPAGE · 221392c3
      Mel Gorman authored
      Michal Hocko reported that the following build error occurs if
      CONFIG_NUMA_BALANCING is set without THP support
      
        kernel/sched/fair.c: In function ‘task_numa_work’:
        kernel/sched/fair.c:932:55: error: call to ‘__build_bug_failed’ declared with attribute error: BUILD_BUG failed
      
      The problem is that HPAGE_PMD_SHIFT triggers a BUILD_BUG() on
      !CONFIG_TRANSPARENT_HUGEPAGE. This patch addresses the problem.
      Reported-by: default avatarMichal Hocko <mhocko@suse.cz>
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      221392c3
    • Hugh Dickins's avatar
      mm: fix kernel BUG at huge_memory.c:1474! · a4f1de17
      Hugh Dickins authored
      Andrea's autonuma-benchmark numa01 hits kernel BUG at huge_memory.c:1474!
      in change_huge_pmd called from change_protection from change_prot_numa
      from task_numa_work.
      
      That BUG, introduced in the huge zero page commit cad7f613 ("thp:
      change_huge_pmd(): make sure we don't try to make a page writable")
      was trying to verify that newprot never adds write permission to an
      anonymous huge page; but Automatic NUMA Balancing's 4b10e7d5 ("mm:
      mempolicy: Implement change_prot_numa() in terms of change_protection()")
      adds a new prot_numa path into change_huge_pmd(), which makes no use of
      the newprot provided, and may retain the write bit in the pmd.
      
      Just move the BUG_ON(pmd_write(entry)) up into the !prot_numa block.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a4f1de17
    • Linus Torvalds's avatar
      Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 2dfea380
      Linus Torvalds authored
      Pull MFS update from Samuel Ortiz:
       "This is the MFD patch set for the 3.8 merge window.
      
        We have several new drivers, most of the time coming with their sub
        devices drivers:
      
         - Austria Microsystem's AS3711
         - Nano River's viperboard
         - TI's TPS80031, AM335x TS/ADC,
         - Realtek's MMC/memstick card reader
         - Nokia's retu
      
        We also got some notable cleanups and improvements:
      
         - tps6586x got converted to IRQ domains.
         - tps65910 and tps65090 moved to the regmap IRQ API.
         - STMPE is now Device Tree aware.
         - A general twl6040 and twl-core cleanup, with moves to the regmap
           I/O and IRQ APIs and a conversion to the recently added PWM
           framework.
         - sta2x11 gained regmap support.
      
        Then the rest is mostly tiny cleanups and fixes, among which we have
        Mark's wm5xxx and wm8xxx patchset."
      
      Far amount of annoying but largely trivial conflicts.  Many due to
      __devinit/exit removal, others due to one or two of the new drivers also
      having come in through another tree.
      
      * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits)
        mfd: tps6507x: Convert to devm_kzalloc
        mfd: stmpe: Update DT support for stmpe driver
        mfd: wm5102: Add readback of DSP status 3 register
        mfd: arizona: Log if we fail to create the primary IRQ domain
        mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ
        mfd: tps80031: Add terminating entry for tps80031_id_table
        mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask()
        mfd: wm5102: Add tuning for revision B
        mfd: arizona: Defer patch initialistation until after first device boot
        mfd: tps65910: Fix wrong ack_base register
        mfd: tps65910: Remove unused data
        mfd: stmpe: Get rid of irq_invert_polarity
        mfd: ab8500-core: Fix invalid free of devm_ allocated data
        mfd: wm5102: Mark DSP memory regions as volatile
        mfd: wm5102: Correct default for LDO1_CONTROL_2
        mfd: arizona: Register haptics devices
        mfd: wm8994: Make current device behaviour the default
        mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ
        mfd: Fix stmpe.c build when OF is not enabled
        mfd: jz4740-adc: Use devm_kzalloc
        ...
      2dfea380