1. 18 Dec, 2012 11 commits
  2. 17 Dec, 2012 11 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
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · aed606e3
      Linus Torvalds authored
      Pull m68knommu updates from Greg Ungerer:
       "This one has a major restructuring of the non-mmu 68000 support.
      
        It merges all the related SoC types that use the original 68000 cpu
        core internally so they can share the same core code.  It also allows
        for supporting the original stand alone 68000 cpu in its own right.
      
        There is also a generalization of the clock support of the ColdFire
        parts, some merging of common ColdFire code, and a couple of bug fixes
        as well."
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: modify clock code so it can be used by all ColdFire CPU types
        m68knommu: add clock definitions for 54xx ColdFire CPU types
        m68knommu: add clock definitions for 5407 ColdFire CPU types
        m68knommu: add clock definitions for 5307 ColdFire CPU types
        m68knommu: add clock definitions for 528x ColdFire CPU types
        m68knommu: add clock definitions for 527x ColdFire CPU types
        m68knommu: add clock definitions for 5272 ColdFire CPU types
        m68knommu: add clock definitions for 525x ColdFire CPU types
        m68knommu: add clock definitions for 5249 ColdFire CPU types
        m68knommu: add clock definitions for 523x ColdFire CPU types
        m68knommu: add clock definitions for 5206 ColdFire CPU types
        m68knommu: add clock creation support macro for other ColdFire CPUs
        m68k: fix unused variable warning in mempcy.c
        m68knommu: make non-MMU page_to_virt() return a void *
        m68knommu: merge ColdFire 5249 and 525x definitions
        m68knommu: disable MC68000 cpu target when MMU is selected
        m68knommu: allow for configuration of true 68000 based systems
        m68knommu: platform code merge for 68000 core cpus
      aed606e3
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 123df7ae
      Linus Torvalds authored
      Pull i2c update from Jean Delvare:
       "This is my last pull request for the i2c subsystem.  It includes all
        the patches I collected between kernel v3.7-rc1 and me passing i2c
        maintenance duties over to Wolfram.
      
        Future patches to the many i2c bus drivers I still maintain will go
        through Wolfram's tree."
      
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Mention functionality flags in SMBus protocol documentation
        i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
        i2c-i801: Enable interrupts for all post-ICH5 chips
        i2c-i801: Add device tree support
        MAINTAINERS: Fix drivers/i2c/busses/i2c-stub.c
      123df7ae
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.8-rc0-tag' of... · 9b690c3d
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
      
      Pull swiotlb update from Konrad Rzeszutek Wilk:
       "Feature:
         - Use dma addresses instead of the virt_to_phys and vice versa
           functions.
      
        Remove the multitude of phys_to_virt/virt_to_phys calls and instead
        operate on the physical addresses instead of virtual in many of the
        internal functions.  This does provide a speed up in interrupt
        handlers that do DMA operations and use SWIOTLB."
      
      * tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
        swiotlb: Do not export swiotlb_bounce since there are no external consumers
        swiotlb: Use physical addresses instead of virtual in swiotlb_tbl_sync_single
        swiotlb: Use physical addresses for swiotlb_tbl_unmap_single
        swiotlb: Return physical addresses when calling swiotlb_tbl_map_single
        swiotlb: Make io_tlb_overflow_buffer a physical address
        swiotlb: Make io_tlb_start a physical address instead of a virtual one
        swiotlb: Make io_tlb_end a physical address instead of a virtual one
      9b690c3d
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 36cd5c19
      Linus Torvalds authored
      Pull ext4 update from Ted Ts'o:
       "There are two major features for this merge window.  The first is
        inline data, which allows small files or directories to be stored in
        the in-inode extended attribute area.  (This requires that the file
        system use inodes which are at least 256 bytes or larger; 128 byte
        inodes do not have any room for in-inode xattrs.)
      
        The second new feature is SEEK_HOLE/SEEK_DATA support.  This is
        enabled by the extent status tree patches, and this infrastructure
        will be used to further optimize ext4 in the future.
      
        Beyond that, we have the usual collection of code cleanups and bug
        fixes."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (63 commits)
        ext4: zero out inline data using memset() instead of empty_zero_page
        ext4: ensure Inode flags consistency are checked at build time
        ext4: Remove CONFIG_EXT4_FS_XATTR
        ext4: remove unused variable from ext4_ext_in_cache()
        ext4: remove redundant initialization in ext4_fill_super()
        ext4: remove redundant code in ext4_alloc_inode()
        ext4: use sync_inode_metadata() when syncing inode metadata
        ext4: enable ext4 inline support
        ext4: let fallocate handle inline data correctly
        ext4: let ext4_truncate handle inline data correctly
        ext4: evict inline data out if we need to strore xattr in inode
        ext4: let fiemap work with inline data
        ext4: let ext4_rename handle inline dir
        ext4: let empty_dir handle inline dir
        ext4: let ext4_delete_entry() handle inline data
        ext4: make ext4_delete_entry generic
        ext4: let ext4_find_entry handle inline data
        ext4: create a new function search_dir
        ext4: let ext4_readdir handle inline data
        ext4: let add_dir_entry handle inline data properly
        ...
      36cd5c19
  3. 16 Dec, 2012 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 2a74dbb9
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "A quiet cycle for the security subsystem with just a few maintenance
        updates."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Smack: create a sysfs mount point for smackfs
        Smack: use select not depends in Kconfig
        Yama: remove locking from delete path
        Yama: add RCU to drop read locking
        drivers/char/tpm: remove tasklet and cleanup
        KEYS: Use keyring_alloc() to create special keyrings
        KEYS: Reduce initial permissions on keys
        KEYS: Make the session and process keyrings per-thread
        seccomp: Make syscall skipping and nr changes more consistent
        key: Fix resource leak
        keys: Fix unreachable code
        KEYS: Add payload preparsing opportunity prior to key instantiate or update
      2a74dbb9
    • Tony Lindgren's avatar
      ARM: OMAP: Fix drivers to depend on omap for internal devices · 770b6cb4
      Tony Lindgren authored
      
      
      These devices are not available on other architectures, so
      let's limit them to omap.
      
      If the driver subsystem maintainers want to build test
      system wide changes without building for each target,
      it's easy to carry a test patch that just strips out the
      depends entries from Kconfig files.
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      770b6cb4
    • Linus Torvalds's avatar
      Merge tag 'balancenuma-v11' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma · 3d59eebc
      Linus Torvalds authored
      Pull Automatic NUMA Balancing bare-bones from Mel Gorman:
       "There are three implementations for NUMA balancing, this tree
        (balancenuma), numacore which has been developed in tip/master and
        autonuma which is in aa.git.
      
        In almost all respects balancenuma is the dumbest of the three because
        its main impact is on the VM side with no attempt to be smart about
        scheduling.  In the interest of getting the ball rolling, it would be
        desirable to see this much merged for 3.8 with the view to building
        scheduler smarts on top and adapting the VM where required for 3.9.
      
        The most recent set of comparisons available from different people are
      
          mel:    https://lkml.org/lkml/2012/12/9/108
          mingo:  https://lkml.org/lkml/2012/12/7/331
          tglx:   https://lkml.org/lkml/2012/12/10/437
          srikar: https://lkml.org/lkml/2012/12/10/397
      
        The results are a mixed bag.  In my own tests, balancenuma does
        reasonably well.  It's dumb as rocks and does not regress against
        mainline.  On the other hand, Ingo's tests shows that balancenuma is
        incapable of converging for this workloads driven by perf which is bad
        but is potentially explained by the lack of scheduler smarts.  Thomas'
        results show balancenuma improves on mainline but falls far short of
        numacore or autonuma.  Srikar's results indicate we all suffer on a
        large machine with imbalanced node sizes.
      
        My own testing showed that recent numacore results have improved
        dramatically, particularly in the last week but not universally.
        We've butted heads heavily on system CPU usage and high levels of
        migration even when it shows that overall performance is better.
        There are also cases where it regresses.  Of interest is that for
        specjbb in some configurations it will regress for lower numbers of
        warehouses and show gains for higher numbers which is not reported by
        the tool by default and sometimes missed in treports.  Recently I
        reported for numacore that the JVM was crashing with
        NullPointerExceptions but currently it's unclear what the source of
        this problem is.  Initially I thought it was in how numacore batch
        handles PTEs but I'm no longer think this is the case.  It's possible
        numacore is just able to trigger it due to higher rates of migration.
      
        These reports were quite late in the cycle so I/we would like to start
        with this tree as it contains much of the code we can agree on and has
        not changed significantly over the last 2-3 weeks."
      
      * tag 'balancenuma-v11' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma: (50 commits)
        mm/rmap, migration: Make rmap_walk_anon() and try_to_unmap_anon() more scalable
        mm/rmap: Convert the struct anon_vma::mutex to an rwsem
        mm: migrate: Account a transhuge page properly when rate limiting
        mm: numa: Account for failed allocations and isolations as migration failures
        mm: numa: Add THP migration for the NUMA working set scanning fault case build fix
        mm: numa: Add THP migration for the NUMA working set scanning fault case.
        mm: sched: numa: Delay PTE scanning until a task is scheduled on a new node
        mm: sched: numa: Control enabling and disabling of NUMA balancing if !SCHED_DEBUG
        mm: sched: numa: Control enabling and disabling of NUMA balancing
        mm: sched: Adapt the scanning rate if a NUMA hinting fault does not migrate
        mm: numa: Use a two-stage filter to restrict pages being migrated for unlikely task<->node relationships
        mm: numa: migrate: Set last_nid on newly allocated page
        mm: numa: split_huge_page: Transfer last_nid on tail page
        mm: numa: Introduce last_nid to the page frame
        sched: numa: Slowly increase the scanning period as NUMA faults are handled
        mm: numa: Rate limit setting of pte_numa if node is saturated
        mm: numa: Rate limit the amount of memory that is migrated between nodes
        mm: numa: Structures for Migrate On Fault per NUMA migration rate limiting
        mm: numa: Migrate pages handled during a pmd_numa hinting fault
        mm: numa: Migrate on reference policy
        ...
      3d59eebc
    • Jean Delvare's avatar
      i2c: Mention functionality flags in SMBus protocol documentation · a1681781
      Jean Delvare authored
      
      
      While the mapping between I2C adapter functionality flags and
      i2c_smbus_*() helper functions is rather obvious, let's still document
      it for clarity.
      
      Also drop the reference to 2 command byte I2C block reads, there is no
      support for that in the kernel at the moment.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      a1681781
    • Joe Perches's avatar
      i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>( · 8117e41e
      Joe Perches authored
      
      
      dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
      and reducing object size is good.
      Coalesce formats for easier grep.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      8117e41e
    • Jean Delvare's avatar
      i2c-i801: Enable interrupts for all post-ICH5 chips · 6676a847
      Jean Delvare authored
      
      
      I did not receive a single bug report after interrupt support was
      added for a limited number of chips. So I'd say the code is good and
      should be enabled for all supported chips, that is: ICH5 and later.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
      6676a847
    • Thierry Reding's avatar
      i2c-i801: Add device tree support · f6afc8b1
      Thierry Reding authored
      
      
      Add support for probing slave devices parsed from the device tree.
      Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      f6afc8b1
    • Cesar Eduardo Barros's avatar
      MAINTAINERS: Fix drivers/i2c/busses/i2c-stub.c · 8547a5bc
      Cesar Eduardo Barros authored
      This file was moved to drivers/i2c/i2c-stub.c by commit 31d178bf
      
      
      (i2c-stub: Move to drivers/i2c).
      
      Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
      Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      8547a5bc
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 55bde6b1
      Dave Airlie authored
      Daniel writes:
      A few leftover fixes for 3.8:
      - VIC support for hdmi infoframes with the associated drm helper, fixes
        some black TVs (Paulo Zanoni)
      - Modeset state check (and fixup if the BIOS messed with the hw) for
        lid-open. modeset-rework fallout. Somehow the original reporter went
        awol, so this stalled for way too long until we've found a new
        victim^Wreporter with broken BIOS.
      - seqno wrap fixes from Mika and Chris.
      - Some minor fixes all over from various people.
      - Another race fix in the pageflip vs. unpin code from Chris.
      - hsw vga resume support and a few more fdi link fixes (only used for vga
        on hsw) from Paulo.
      - Regression fix for DMAR from Zhenyu Wang - I've scavenged memory from my
        DMAR for a while and it broke right away :(
      - Regression fix from Takashi Iwai for ivb lvds - some w/a needs to be
        (partially) moved back into place. Note that these are regressions in
        -next.
      - One more fix for ivb 3 pipe support - it now actually seems to work.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (25 commits)
        drm/i915: Fix missed needs_dmar setting
        drm/i915: Fix shifted screen on top of LVDS on IVY laptop
        drm/i915: disable cpt phase pointer fdi rx workaround
        drm/i915: set the LPT FDI RX polarity reversal bit when needed
        drm/i915: add lpt_init_pch_refclk
        drm/i915: add support for mPHY destination on intel_sbi_{read, write}
        drm/i915: reject modes the LPT FDI receiver can't handle
        drm/i915: fix hsw_fdi_link_train "retry" code
        drm/i915: Close race between processing unpin task and queueing the flip
        drm/i915: fixup l3 parity sysfs access check
        drm/i915: Clear the existing watermarks for g4x when modifying the cursor sr
        drm/i915: do not access BLC_PWM_CTL2 on pre-gen4 hardware
        drm/i915: Don't allow ring tail to reach the same cacheline as head
        drm/i915: Decouple the object from the unbound list before freeing pages
        drm/i915: Set sync_seqno properly after seqno wrap
        drm/i915: Include the last semaphore sync point in the error-state
        drm/i915: Rearrange code to only have a single method for waiting upon the ring
        drm/i915: Simplify flushing activity on the ring
        drm/i915: Preallocate next seqno before touching the ring
        drm/i915: force restore on lid open
        ...
      55bde6b1
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-next' of... · 2f3f2406
      Dave Airlie authored
      Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Inki writes:
      "- add dmabuf attach/detach feature
        . This patch would resolve performance deterioration issue
          when v4l2-based driver is using the buffer imported from gem.
      - drm/exynos: use DMA_ATTR_NO_KERNEL_MAPPING attribute
        . With gem allocation, kernel space mapping isn't allocated and
          also physical pages aren't mapped with the kernel space.
          The physical pages are mapped with kernel space though vmap
          function only for console framebuffer.
      - add the below two patches I missed.
        drm: exynos: moved exynos drm device registration to drm driver
        drm: exynos: moved exynos drm hdmi device registration to drm driver
      - add IPP subsystem framework and its-based device drivers.
        . This patch set includes fimc, rotator and gsc drivers to perform
          image scaling, rotation and color space conversion.
      - add runtime pm support to hdmi driver.
      - And fixups and cleanups."
      
      * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (30 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
        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
        drm/exynos: hdmi: Fix potential NULL pointer dereference error
        drm/exynos: hdmi: Add CONFIG_OF and use of_match_ptr() macro
        drm/exynos: add support for hdmiphy power control for exynos5
        drm/exynos: add runtime pm support for mixer
        drm/exynos: added runtime pm support for hdmi
        drm/exynos: fix allocation and cache mapping type
        drm/exynos: reorder framebuffer init sequence
        drm/exynos/iommu: fix return value check in drm_create_iommu_mapping()
        drm/exynos: remove unused vaddr member
        drm/exynos: use DMA_ATTR_NO_KERNEL_MAPPING attribute
        drm/exynos: add exception codes to exynos_drm_fbdev_create()
        ...
      2f3f2406
  4. 15 Dec, 2012 8 commits
    • Linus Torvalds's avatar
      Revert "x86-64/efi: Use EFI to deal with platform wall clock (again)" · 11520e5e
      Linus Torvalds authored
      This reverts commit bd52276f ("x86-64/efi: Use EFI to deal with
      platform wall clock (again)"), and the two supporting commits:
      
        da5a108d: "x86/kernel: remove tboot 1:1 page table creation code"
      
        185034e7: "x86, efi: 1:1 pagetable mapping for virtual EFI calls")
      
      as they all depend semantically on commit 53b87cf0
      
       ("x86, mm:
      Include the entire kernel memory map in trampoline_pgd") that got
      reverted earlier due to the problems it caused.
      
      This was pointed out by Yinghai Lu, and verified by me on my Macbook Air
      that uses EFI.
      Pointed-out-by: default avatarYinghai Lu <yinghai@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      11520e5e
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 5bd665f2
      Linus Torvalds authored
      Pull target updates from Nicholas Bellinger:
       "It has been a very busy development cycle this time around in target
        land, with the highlights including:
      
         - Kill struct se_subsystem_dev, in favor of direct se_device usage
           (hch)
         - Simplify reservations code by combining SPC-3 + SCSI-2 support for
           virtual backends only (hch)
         - Simplify ALUA code for virtual only backends, and remove left over
           abstractions (hch)
         - Pass sense_reason_t as return value for I/O submission path (hch)
         - Refactor MODE_SENSE emulation to allow for easier addition of new
           mode pages.  (roland)
         - Add emulation of MODE_SELECT (roland)
         - Fix bug in handling of ExpStatSN wrap-around (steve)
         - Fix bug in TMR ABORT_TASK lookup in qla2xxx target (steve)
         - Add WRITE_SAME w/ UNMAP=0 support for IBLOCK backends (nab)
         - Convert ib_srpt to use modern target_submit_cmd caller + drop
           legacy ioctx->kref usage (nab)
         - Convert ib_srpt to use modern target_submit_tmr caller (nab)
         - Add link_magic for fabric allow_link destination target_items for
           symlinks within target_core_fabric_configfs.c code (nab)
         - Allocate pointers in instead of full structs for
           config_group->default_groups (sebastian)
         - Fix 32-bit highmem breakage for FILEIO (sebastian)
      
        All told, hch was able to shave off another ~1K LOC by killing the
        se_subsystem_dev abstraction, along with a number of PR + ALUA
        simplifications.  Also, a nice patch by Roland is the refactoring of
        MODE_SENSE handling, along with the addition of initial MODE_SELECT
        emulation support for virtual backends.
      
        Sebastian found a long-standing issue wrt to allocation of full
        config_group instead of pointers for config_group->default_group[]
        setup in a number of areas, which ends up saving memory with big
        configurations.  He also managed to fix another long-standing BUG wrt
        to broken 32-bit highmem support within the FILEIO backend driver.
      
        Thank you again to everyone who contributed this round!"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (50 commits)
        target/iscsi_target: Add NodeACL tags for initiator group support
        target/tcm_fc: fix the lockdep warning due to inconsistent lock state
        sbp-target: fix error path in sbp_make_tpg()
        sbp-target: use simple assignment in tgt_agent_rw_agent_state()
        iscsi-target: use kstrdup() for iscsi_param
        target/file: merge fd_do_readv() and fd_do_writev()
        target/file: Fix 32-bit highmem breakage for SGL -> iovec mapping
        target: Add link_magic for fabric allow_link destination target_items
        ib_srpt: Convert TMR path to target_submit_tmr
        ib_srpt: Convert I/O path to target_submit_cmd + drop legacy ioctx->kref
        target: Make spc_get_write_same_sectors return sector_t
        target/configfs: use kmalloc() instead of kzalloc() for default groups
        target/configfs: allocate only 6 slots for dev_cg->default_groups
        target/configfs: allocate pointers instead of full struct for default_groups
        target: update error handling for sbc_setup_write_same()
        iscsit: use GFP_ATOMIC under spin lock
        iscsi_target: Remove redundant null check before kfree
        target/iblock: Forward declare bio helpers
        target: Clean up flow in transport_check_aborted_status()
        target: Clean up logic in transport_put_cmd()
        ...
      5bd665f2
    • Dave Airlie's avatar
      Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next · 652a1876
      Dave Airlie authored
      Fix regression, and some locking races, also as CS support
      for the DMA engines.
      
      * 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux:
        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
      652a1876
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 115b1cc2
      Linus Torvalds authored
      Pull EXTCON patches from Greg Kroah-Hartman:
       "Here are some drivers/extcon/ patches that I forgot to have you pull
        in the larger char/misc patchset from yesterday, for the 3.8-rc1
        kernel.
      
        Nothing major here, just some driver updates, and cleanups, all of
        which have been in linux-next for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        extcon: kernel_doc style fix
        extcon: max77693: Fix uninitialised variable warning
        extcon: max77693: Use devm_kzalloc
        extcon: max8997: Use devm_kzalloc
        extcon: max8997: Fix a typo
        extcon: max8997: Fix checkpatch error
        extcon: max77693: Fix coding style
        extcon: max77693: Fix incorrect error check and return value
        extcon: max8997: Fix incorrect error check and return value
        extcon: Fix return value in extcon-class.c
        extcon: Add missing header file to extcon.h
        extcon: arizona: unlock mutex on error path in arizona_micdet()
      115b1cc2
    • Linus Torvalds's avatar
      Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux · 2b831888
      Linus Torvalds authored
      Pull fbdev changes from Tomi Valkeinen:
       "OMAPDSS changes, including:
         - use dynanic debug prints
         - OMAP platform dependency removals
         - Creation of compat-layer, helping us to improve omapdrm
         - Misc cleanups, aiming to make omadss more in line with the upcoming
           common display framework
      
        Exynos DP changes for the 3.8 merge window:
         - Device Tree support for Samsung Exynos DP
         - SW Link training is cleaned up.
         - HPD interrupt is supported.
      
        Samsung Framebuffer changes for the 3.8 merge window:
         - The bit definitions of header file are updated.
         - Some minor typos are fixed.
         - Some minor bugs of s3c_fb_check_var() are fixed.
      
        FB related changes for SH Mobile, Freescale DIU
      
        Add support for the Solomon SSD1307 OLED Controller"
      
      * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
        OMAPDSS: fix TV-out issue with DSI PLL
        Revert "OMAPFB: simplify locking"
        OMAPFB: remove silly loop in fb2display()
        OMAPFB: fix error handling in omapfb_find_best_mode()
        OMAPFB: use devm_kzalloc to allocate omapfb2_device
        OMAPDSS: DISPC: remove dispc fck uses
        OMAPDSS: DISPC: get dss clock rate from dss driver
        drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
        drivers/video: add support for the Solomon SSD1307 OLED Controller
        OMAPDSS: use omapdss_compat_init() in other drivers
        OMAPDSS: export dispc functions
        OMAPDSS: export dss_feat functions
        OMAPDSS: export dss_mgr_ops functions
        OMAPDSS: separate compat files in the Makefile
        OMAPDSS: move display sysfs init to compat layer
        OMAPDSS: DPI: use dispc's check_timings
        OMAPDSS: DISPC: add dispc_ovl_check()
        OMAPDSS: move irq handling to dispc-compat
        OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
        OMAPDSS: move blocking mgr enable/disable to compat layer
        ...
      
      Conflicts:
      	arch/arm/mach-davinci/devices-da8xx.c
      	arch/arm/plat-omap/common.c
      	drivers/media/platform/omap/omap_vout.c
      2b831888
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · e81d372f
      Linus Torvalds authored
      Pull LED subsystem update from Bryan Wu.
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (47 commits)
        leds: leds-lp5521: return an error code on error in probe()
        leds: leds-clevo-mail: Use pr_* instead of printks
        leds: leds-rb532: Fix checkpatch errors
        leds: led-triggers: Fix checkpatch warnings
        leds: ledtrig-backlight: Fix checkpatch error
        leds: leds-wrap: Use <linux/io.h> instead of <asm/io.h>
        leds: leds-wm8350: Use dev_err instead of printk
        leds: leds-pwm: Fix checkpatch warning
        leds: leds-pca955x: Use dev_info instead of printk
        leds: leds-net48xx: Use linux/io.h instead of asm/io.h
        leds: leds-lt3593: Fix checkpatch warnings
        leds: leds-gpio: Use dev_info instead of printk
        leds: leds-da903x: Fix checkpatch error and warnings
        leds: leds-bd2802: Fix checkpatch warnings
        leds: leds-adp5520: Fix checkpatch warnings
        leds: led-class: Fix checkpatch warning
        leds: leds-ns2: use devm_gpio_request_one
        leds: leds-lt3593: use devm_gpio_request_one
        leds: leds-gpio: use devm_gpio_request_one
        leds: lp3944: Fix return value
        ...
      e81d372f
    • Linus Torvalds's avatar
      Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore · 75e300c8
      Linus Torvalds authored
      Pull pstore update from Anton Vorontsov:
       "Here are just a few fixups for the pstore subsystem, nothing special
        this time"
      
      * tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore:
        pstore/ftrace: Adjust for ftrace_ops->func prototype change
        pstore/ram: Fix bounds checks for mem_size, record_size, console_size and ftrace_size
        pstore/ram: Fix undefined usage of rounddown_pow_of_two(0)
        pstore/ram: Fixup section annotations
      75e300c8
    • Linus Torvalds's avatar
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · c13e69b2
      Linus Torvalds authored
      Pull libata updates from Jeff Garzik:
      
       - More ACPI fixes
      
       - ata_piix: cosmetic code movement, re-enable MS Virtual PC support
      
       - generic platform driver improvements; use common code
      
       - pata_cs5536: add quirk for broken udma
      
       - printk prettiness (dev_printk becomes dev_info, etc.)
      
       - sata_promise: fix hardreset lockdep error
      
       - minor cleanups from Sergei Shtylyov
      
       - minor, automated cleanups from Wei Yongjun
      
       - fix null ptr deref bug, in sysfs API
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (37 commits)
        sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644)
        [libata] fix Null pointer dereference on disk error
        ahci: convert ata_link_printk() to ata_link_warn()
        pata_imx: convert ata_dev_printk() to ata_dev_info()
        ARM: ep93xx: convert ata_<foo>_printk() to ata_<foo>_<level>()
        ahci_platform: make structs static
        Revert "pata_octeon_cf: perform host detach, removal on exit"
        Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl"
        pata_of_platform: fix compile error
        libata: use pci_get_drvdata() helper
        pata_octeon_cf: perform host detach, removal on exit
        sata_highbank: utilize common ata_platform_remove_one()
        pata_palmld: utilize common ata_platform_remove_one()
        pata_platform: remove unused remove function
        pata_platform: utilize common ata_platform_remove_one()
        pata_of_platform: utilize common ata_platform_remove_one()
        pata_mpc52xx: utilize common ata_platform_remove_one()
        pata_ixp4xx_cf: utilize common ata_platform_remove_one()
        ahci_platform: utilize common ata_platform_remove_one()
        libata: implement ata_platform_remove_one()
        ...
      c13e69b2