1. 09 Oct, 2012 6 commits
  2. 07 Oct, 2012 7 commits
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 1f31c69d
      Dave Airlie authored
      Daniel writes:
      
      Bigger -fixes pile, mostly because I've included Ajax' DP dongle stuff,
      as discussed on irc. Otherwise just small things:
      - regression fix to finally make 6bpc auto-dither on dp work (Jani)
      - reinstate an snb ctx w/a that accidentally got lost in a rework (Chris)
      - fixup the DP train sequence, logic-goof-up uncovered by Coverty (Chris)
      - fix set_caching locking (Ben)
      - fix spurious segfault on con-current gtt mmap faulting (Dimitry and Mika)
      - some pageflip correctness fixes (still hunting down some issues, but
        these are the worst offenders of confused code that we've tracked down
        thus far) from Chris and me
      - fixup swizzling settings on vlv (Jesse)
      - gt_mode w/a from Ben added, fixes snb gt1 rc6+hw ctx hangs.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: Fix GT_MODE default value
        drm/i915: don't frob the vblank ts in finish_page_flip
        drm/i915: call drm_handle_vblank before finish_page_flip
        drm/i915: print warning if vmi915_gem_fault error is not handled
        drm/i915: EBUSY status handling added to i915_gem_fault().
        drm/i915: Try harder to complete DP training pattern 1
        drm/i915: set swizzling to none on VLV
        drm/dp: Make sink count DP 1.2 aware
        drm/dp: Document DP spec versions for various DPCD registers
        drm/i915/dp: Be smarter about connection sense for branch devices
        drm/i915/dp: Fetch downstream port info if needed during DPCD fetch
        drm/dp: Update DPCD defines
        drm: Export drm_probe_ddc()
        drm/i915: Flush the pending flips on the CRTC before modification
        drm/i915: Actually invalidate the TLB for the SandyBridge HW contexts w/a
        drm/i915: Fix set_caching locking
        drm/i915: use adjusted_mode instead of mode for checking the 6bpc force flag
      1f31c69d
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next · a5a0fc67
      Dave Airlie authored
      Inki writes:
      "this patch set updates exynos drm framework and includes minor fixups.
      and this pull request except hdmi device tree support patch set posted
      by Rahul Sharma because that includes media side patch so for this
      patch set, we may have git pull one more time in addition, if we get
      an agreement with media guys. for this patch, you can refer to below link,
              http://comments.gmane.org/gmane.comp.video.dri.devel/74504
      
       this pull request adds hdmi device tree support
      and includes related patch set such as disabling of hdmi internal
      interrupt, suppport for platform variants for hdmi and mixer,
      support to disable video processor based on platform type and
      removal of drm common platform data. as you know, this patch
      set was delayed because it included an media side patch. so for this,
      we got an ack from v4l2-based hdmi driver author, Tomasz Stanislawski."
      
      * 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung: (34 commits)
        drm: exynos: hdmi: remove drm common hdmi platform data struct
        drm: exynos: hdmi: add support for exynos5 hdmi
        drm: exynos: hdmi: replace is_v13 with version check in hdmi
        drm: exynos: hdmi: add support for exynos5 mixer
        drm: exynos: hdmi: add support to disable video processor in mixer
        drm: exynos: hdmi: add support for platform variants for mixer
        drm: exynos: hdmi: add support for exynos5 hdmiphy
        drm: exynos: hdmi: add support for exynos5 ddc
        drm: exynos: remove drm hdmi platform data struct
        drm: exynos: hdmi: turn off HPD interrupt in HDMI chip
        drm: exynos: hdmi: use s5p-hdmi platform data
        drm: exynos: hdmi: fix interrupt handling
        drm: exynos: hdmi: support for platform variants
        media: s5p-hdmi: add HPD GPIO to platform data
        drm/exynos: fix kcalloc size of g2d cmdlist node
        drm/exynos: fix to calculate CRTC shown via screen
        drm/exynos: fix display power call issue.
        drm/exynos: add platform_device_id table and driver data for drm fimd
        drm/exynos: Fix potential NULL pointer dereference
        drm/exynos: support drm_wait_vblank feature for VIDI
        ...
      
      Conflicts:
      	include/drm/exynos_drm.h
      a5a0fc67
    • Dave Airlie's avatar
      Merge branch 'disintegrate-drm' of... · 0dbe2321
      Dave Airlie authored
      Merge branch 'disintegrate-drm' of git://git.infradead.org/users/dhowells/linux-headers into drm-next
      
      Merge the uapi bits for drm.
      
      * 'disintegrate-drm' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate include/drm
      0dbe2321
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 0b8e74c6
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "The first part of the media updates for Kernel 3.7.
      
        This series contain:
      
         - A major tree renaming patch series: now, drivers are organized
           internally by their used bus, instead of by V4L2 and/or DVB API,
           providing a cleaner driver location for hybrid drivers that
           implement both APIs, and allowing to cleanup the Kconfig items and
           make them more intuitive for the end user;
      
         - Media Kernel developers are typically very lazy with their duties
           of keeping the MAINTAINERS entries for their drivers updated.  As
           now the tree is more organized, we're doing an effort to add/update
           those entries for the drivers that aren't currently orphan;
      
         - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
           core fixes several bugs (as the existing one that got bitroted).
           Now, suspend/resume finally started to work fine (at least with
           some devices - we should expect more work with regards to it);
      
         - added multistream support for DVB-T2, and unified the API for
           DVB-S2 and ISDB-S.  Backward binary support is preserved;
      
         - as usual, a few new drivers, some V4L2 core improvements and lots
           of drivers improvements and fixes.
      
        There are some points to notice on this series:
      
         1) you should expect a trivial merge conflict on your tree, with the
            removal of Documentation/feature-removal-schedule.txt: this series
            would be adding two additional entries there.  I opted to not
            rebase it due to this recent change;
      
         2) With regards to the PCTV 520e udev-related breakage, I opted to
            fix it in a way that the patches can be backported to 3.5 even
            without your firmware fix patch.  This way, Greg doesn't need to
            rush backporting your patch (as there are still the firmware cache
            and firmware path customization issues to be addressed there).
      
            I'll send later a patch (likely after the end of the merge window)
            reverting the rest of the DRX-K async firmware request, fully
            restoring its original behaviour to allow media drivers to
            initialize everything serialized as before for 3.7 and upper.
      
         3) I'm planning to work on this weekend to test the DMABUF patches
            for V4L2.  The patches are on my queue for several Kernel cycles,
            but, up to now, there is/was no way to test the series locally.
      
            I have some concerns about this particular changeset with regards
            to security issues, and with regards to the replacement of the old
            VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
            GPU drivers change.  The Overlay API allows direct PCI2PCI
            transfers from a media capture card into the GPU framebuffer, but
            its API is crappy.  Also, the only existing X11 driver that
            implements it requires a XV extension that is not available
            anymore on modern drivers.  The DMABUF can do the same thing, but
            with it is promising to be a properly-designed API.  If I can
            successfully test this series and be happy with it, I should be
            asking you to pull them next week."
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
        em28xx: regression fix: use DRX-K sync firmware requests on em28xx
        drxk: allow loading firmware synchrousnously
        em28xx: Make all em28xx extensions to be initialized asynchronously
        [media] tda18271: properly report read errors in tda18271_get_id
        [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
        [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
        [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
        [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
        [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
        [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
        [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
        [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
        [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
        [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
        [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
        [media] exynos-gsc: Add missing static storage class specifiers
        [media] exynos-gsc: Remove <linux/version.h> header file inclusion
        [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
        [media] s5p-tv: Fix potential NULL pointer dereference error
        [media] s5k6aa: Fix possible NULL pointer dereference
        ...
      0b8e74c6
    • Linus Torvalds's avatar
      Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore · 7f60ba38
      Linus Torvalds authored
      Pull pstore changes from Anton Vorontsov:
      
       1) We no longer ad-hoc to the function tracer "high level"
          infrastructure and no longer use its debugfs knobs.  The change
          slightly touches kernel/trace directory, but it got the needed ack
          from Steven Rostedt:
      
            http://lkml.org/lkml/2012/8/21/688
      
       2) Added maintainers entry;
      
       3) A bunch of fixes, nothing special.
      
      * tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
        pstore: Avoid recursive spinlocks in the oops_in_progress case
        pstore/ftrace: Convert to its own enable/disable debugfs knob
        pstore/ram: Add missing platform_device_unregister
        MAINTAINERS: Add pstore maintainers
        pstore/ram: Mark ramoops_pstore_write_buf() as notrace
        pstore/ram: Fix printk format warning
        pstore/ram: Fix possible NULL dereference
      7f60ba38
    • Linus Torvalds's avatar
      Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6 · e665faa4
      Linus Torvalds authored
      Pull battery updates from Anton Vorontsov:
       "1. New drivers:
           - Marvell 88pm860x charger and battery drivers;
           - Texas Instruments LP8788 charger driver;
        2. Two new power supply properties: whether a battery is authentic,
           and chargers' maximal currents and voltages;
        3. A lot of TI LP8727 Charger cleanups;
        4. New features for Charger Manager, mainly now we can disable
           specific regulators;
        5. Random fixes and cleanups for other drivers."
      
      Fix up trivial conflicts in <linux/mfd/88pm860x.h>
      
      * tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
        pda_power: Remove ac_draw_failed goto and label
        charger-manager: Add support sysfs entry for charger
        charger-manager: Support limit of maximum possible
        charger-manager: Check fully charged state of battery periodically
        lp8727_charger: More pure cosmetic improvements
        lp8727_charger: Fix checkpatch warning
        lp8727_charger: Add description in the private data
        lp8727_charger: Fix a typo - chg_parm to chg_param
        lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
        lp8727_charger: Clean up lp8727_charger_changed()
        lp8727_charger: Return if the battery is discharging
        lp8727_charger: Make lp8727_charger_get_propery() simpler
        lp8727_charger: Make lp8727_ctrl_switch() inline
        lp8727_charger: Make lp8727_init_device() shorter
        lp8727_charger: Clean up lp8727_is_charger_attached()
        lp8727_charger: Use specific definition
        lp8727_charger: Clean up lp8727 definitions
        lp8727_charger: Use the definition rather than enum
        lp8727_charger: Fix code for getting battery temp
        lp8727_charger: Clear interrrupts at inital time
        ...
      e665faa4
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · ca4da694
      Linus Torvalds authored
      Pull infiniband changes from Roland Dreier:
        "Second batch of changes for the 3.7 merge window:
         - Late-breaking fix for IPoIB on mlx4 SR-IOV VFs.
         - Fix for IPoIB build breakage with CONFIG_INFINIBAND_IPOIB_CM=n (new
           netlink config changes are to blame).
         - Make sure retry count values are in range in RDMA CM.
         - A few nes hardware driver fixes and cleanups.
         - Have iSER initiator use >1 interrupt vectors if available."
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cma: Check that retry count values are in range
        IB/iser: Add more RX CQs to scale out processing of SCSI responses
        RDMA/nes: Bump the version number of nes driver
        RDMA/nes: Remove unused module parameter "send_first"
        RDMA/nes: Remove unnecessary if-else statement
        RDMA/nes: Add missing break to switch.
        mlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFs
        IPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=n
      ca4da694
  3. 06 Oct, 2012 3 commits
    • Linus Torvalds's avatar
      Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers · ed5062dd
      Linus Torvalds authored
      Pull UAPI disintegration fixes from David Howells:
       "There are three main parts:
      
       (1) I found I needed some more fixups in the wake of testing Arm64
           (some asm/unistd.h files had weird guards that caused problems -
           mostly in arches for which I don't have a compiler) and some
           __KERNEL__ splitting needed to take place in Arm64.
      
       (2) I found that c6x was missing some __KERNEL__ guards in its
           asm/signal.h.  Mark Salter pointed me at a tree with a patch to
           remove that file entirely and use the asm-generic variant instead.
      
       (3) Lastly, m68k turned out to have a header installation problem due
           to it lacking a kvm_para.h file.
      
           The conditional installation bits for linux/kvm_para.h, linux/kvm.h
           and linux/a.out.h weren't very well specified - and didn't work if
           an arch didn't have the asm/ version of that file, but there *was*
           an asm-generic/ version.
      
           It seems the "ifneq $((wildcard ...),)" for each of those three
           headers in include/kernel/Kbuild is invoked twice during header
           installation, and the second time it matches on the just installed
           asm-generic/kvm_para.h file and thus incorrectly installs
           linux/kvm_para.h as well.
      
           Most arches actually have an asm/kvm_para.h, so this wasn't
           detectable in those."
      
      * 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
        c6x: remove c6x signal.h
        UAPI: Split compound conditionals containing __KERNEL__ in Arm64
        UAPI: Fix the guards on various asm/unistd.h files
        c6x: make dsk6455 the default config
      ed5062dd
    • Linus Torvalds's avatar
      Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 125b79d7
      Linus Torvalds authored
      Pull SLAB changes from Pekka Enberg:
       "New and noteworthy:
      
        * More SLAB allocator unification patches from Christoph Lameter and
          others.  This paves the way for slab memcg patches that hopefully
          will land in v3.8.
      
        * SLAB tracing improvements from Ezequiel Garcia.
      
        * Kernel tainting upon SLAB corruption from Dave Jones.
      
        * Miscellanous SLAB allocator bug fixes and improvements from various
          people."
      
      * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (43 commits)
        slab: Fix build failure in __kmem_cache_create()
        slub: init_kmem_cache_cpus() and put_cpu_partial() can be static
        mm/slab: Fix kmem_cache_alloc_node_trace() declaration
        Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
        mm, slob: fix build breakage in __kmalloc_node_track_caller
        mm/slab: Fix kmem_cache_alloc_node_trace() declaration
        mm/slab: Fix typo _RET_IP -> _RET_IP_
        mm, slub: Rename slab_alloc() -> slab_alloc_node() to match SLAB
        mm, slab: Rename __cache_alloc() -> slab_alloc()
        mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype
        mm, slab: Replace 'caller' type, void* -> unsigned long
        mm, slob: Add support for kmalloc_track_caller()
        mm, slab: Remove silly function slab_buffer_size()
        mm, slob: Use NUMA_NO_NODE instead of -1
        mm, sl[au]b: Taint kernel when we detect a corrupted slab
        slab: Only define slab_error for DEBUG
        slab: fix the DEADLOCK issue on l3 alien lock
        slub: Zero initial memory segment for kmem_cache and kmem_cache_node
        Revert "mm/sl[aou]b: Move sysfs_slab_add to common"
        mm/sl[aou]b: Move kmem_cache refcounting to common code
        ...
      125b79d7
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-arm-tag' of... · f1c6872e
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull ADM Xen support from Konrad Rzeszutek Wilk:
      
        Features:
         * Allow a Linux guest to boot as initial domain and as normal guests
           on Xen on ARM (specifically ARMv7 with virtualized extensions).  PV
           console, block and network frontend/backends are working.
        Bug-fixes:
         * Fix compile linux-next fallout.
         * Fix PVHVM bootup crashing.
      
        The Xen-unstable hypervisor (so will be 4.3 in a ~6 months), supports
        ARMv7 platforms.
      
        The goal in implementing this architecture is to exploit the hardware
        as much as possible.  That means use as little as possible of PV
        operations (so no PV MMU) - and use existing PV drivers for I/Os
        (network, block, console, etc).  This is similar to how PVHVM guests
        operate in X86 platform nowadays - except that on ARM there is no need
        for QEMU.  The end result is that we share a lot of the generic Xen
        drivers and infrastructure.
      
        Details on how to compile/boot/etc are available at this Wiki:
      
          http://wiki.xen.org/wiki/Xen_ARMv7_with_Virtualization_Extensions
      
        and this blog has links to a technical discussion/presentations on the
        overall architecture:
      
          http://blog.xen.org/index.php/2012/09/21/xensummit-sessions-new-pvh-virtualisation-mode-for-arm-cortex-a15arm-servers-and-x86/
      
      * tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (21 commits)
        xen/xen_initial_domain: check that xen_start_info is initialized
        xen: mark xen_init_IRQ __init
        xen/Makefile: fix dom-y build
        arm: introduce a DTS for Xen unprivileged virtual machines
        MAINTAINERS: add myself as Xen ARM maintainer
        xen/arm: compile netback
        xen/arm: compile blkfront and blkback
        xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree
        xen/arm: receive Xen events on ARM
        xen/arm: initialize grant_table on ARM
        xen/arm: get privilege status
        xen/arm: introduce CONFIG_XEN on ARM
        xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM
        xen/arm: Introduce xen_ulong_t for unsigned long
        xen/arm: Xen detection and shared_info page mapping
        docs: Xen ARM DT bindings
        xen/arm: empty implementation of grant_table arch specific functions
        xen/arm: sync_bitops
        xen/arm: page.h definitions
        xen/arm: hypercalls
        ...
      f1c6872e
  4. 05 Oct, 2012 24 commits