1. 26 9月, 2015 1 次提交
  2. 25 9月, 2015 10 次提交
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · ced255c0
      Linus Torvalds 提交于
      Pull thermal management fixes from Zhang Rui:
      
       - Power allocator governor changes to allow binding on thermal zones
         with missing power estimates information.  From Javi Merino.
      
       - Add compile test flags on thermal drivers that allow it without
         producing compilation errors.  From Eduardo Valentin.
      
       - Fixes around memory allocation on cpu_cooling.  From Javi Merino.
      
       - Fix on db8500 cpufreq code to allow autoload.  From Luis de
         Bethencourt.
      
       - Maintainer entries for cpu cooling device
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: power_allocator: exit early if there are no cooling devices
        thermal: power_allocator: don't require tzp to be present for the thermal zone
        thermal: power_allocator: relax the requirement of two passive trip points
        thermal: power_allocator: relax the requirement of a sustainable_power in tzp
        thermal: Add a function to get the minimum power
        thermal: cpu_cooling: free power table on error or when unregistering
        thermal: cpu_cooling: don't call kcalloc() under rcu_read_lock
        thermal: db8500_cpufreq_cooling: Fix module autoload for OF platform driver
        thermal: cpu_cooling: Add MAINTAINERS entry
        thermal: ti-soc: Kconfig fix to avoid menu showing wrongly
        thermal: ti-soc: allow compile test
        thermal: qcom_spmi: allow compile test
        thermal: exynos: allow compile test
        thermal: armada: allow compile test
        thermal: dove: allow compile test
        thermal: kirkwood: allow compile test
        thermal: rockchip: allow compile test
        thermal: spear: allow compile test
        thermal: hisi: allow compile test
        thermal: Fix thermal_zone_of_sensor_register to match documentation
      ced255c0
    • L
      Merge tag 'devicetree-fixes-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 4401555a
      Linus Torvalds 提交于
      Pull DeviceTree fixes from Rob Herring:
       - Silence bogus warning for of_irq_parse_pci
       - Fix typo in ARM idle-states binding doc and dts files
       - Various minor binding documentation updates
      
      * tag 'devicetree-fixes-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        Documentation: arm: Fix typo in the idle-states bindings examples
        gpio: mention in DT binding doc that <name>-gpio is deprecated
        of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages.
        devicetree: bindings: Extend the bma180 bindings with bma250 info
        of: thermal: Mark cooling-*-level properties optional
        of: thermal: Fix inconsitency between cooling-*-state and cooling-*-level
        Docs: dt: add #msi-cells to GICv3 ITS binding
        of: add vendor prefix for Socionext Inc.
      4401555a
    • L
      Documentation: arm: Fix typo in the idle-states bindings examples · a13f18f5
      Lorenzo Pieralisi 提交于
      The idle-states bindings mandate that the entry-method string
      in the idle-states node must be "psci" for ARM v8 64-bit systems,
      but the examples in the bindings report a wrong entry-method string.
      Owing to this typo, some dts in the kernel wrongly defined the
      entry-method property, since they likely cut and pasted the example
      definition without paying attention to the bindings definitions.
      
      This patch fixes the typo in the DT idle states bindings examples and
      respective dts in the kernel so that the bindings and related dts
      files are made compliant.
      Signed-off-by: NLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
      Cc: Howard Chen <howard.chen@linaro.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Heiko Stuebner <heiko@sntech.de>
      Signed-off-by: NRob Herring <robh@kernel.org>
      a13f18f5
    • J
      gpio: mention in DT binding doc that <name>-gpio is deprecated · e7ae65ce
      Javier Martinez Canillas 提交于
      The gpiolib supports parsing DT properties of the form <name>-gpio but it
      was only added for compatibility with older DT bindings that got it wrong
      and should not be used in newer bindings.
      
      The commit that added support for this was:
      
      dd34c37a ("gpio: of: Allow -gpio suffix for property names")
      
      but didn't update the documentation to explain this so it's been a source
      of confusion. So let's make this clear in the GPIO DT binding doc.
      Signed-off-by: NJavier Martinez Canillas <javier@osg.samsung.com>
      Signed-off-by: NRob Herring <robh@kernel.org>
      e7ae65ce
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · cc8b8fae
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Most of the GPU drivers people were at XDC last week, so I didn't get
        much to send, so I let it rollover until this week.
      
        Also Alex was away for 3 weeks so amdgpu/radeon got a bit more stuff
        than usual in one go.
      
        I've been trying to figure out some 4.2 issues with i915 still (that
        are fixed in 4.3, but bisecting ends up in a merge commit).  Hopefully
        next week I or i915 people can work that out"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (46 commits)
        drm: Allow also control clients to check the drm version
        drm/vmwgfx: Fix uninitialized return in vmw_kms_helper_dirty()
        drm/vmwgfx: Fix uninitialized return in vmw_cotable_unbind()
        drm/layerscape: fix handling fsl_dcu_drm_plane_index result
        drm/mgag200: Fix driver_load error handling
        drm/mgag200: Fix error handling paths in fbdev driver
        drm/qxl: only report first monitor as connected if we have no state
        drm/radeon: add quirk for MSI R7 370
        drm/amdgpu: Sprinkle drm_modeset_lock_all to appease locking checks
        drm/radeon: Sprinkle drm_modeset_lock_all to appease locking checks
        drm/amdgpu: sync ce and me with SWITCH_BUFFER(2)
        drm/amdgpu: integer overflow in amdgpu_mode_dumb_create()
        drm/amdgpu: info leak in amdgpu_gem_metadata_ioctl()
        drm/amdgpu: integer overflow in amdgpu_info_ioctl()
        drm/amdgpu: unwind properly in amdgpu_cs_parser_init()
        drm/amdgpu: Fix max_vblank_count value for current display engines
        drm/amdgpu: use kmemdup rather than duplicating its implementation
        drm/amdgpu: fix UVD suspend and resume for VI APU
        drm/amdgpu: fix the UVD suspend sequence order
        drm/amdgpu: make UVD handle checking more strict
        ...
      cc8b8fae
    • L
      Merge branch 'akpm' (patches from Andrew) · bfbaa60d
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "15 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        ocfs2/dlm: fix deadlock when dispatch assert master
        membarrier: clean up selftest
        vmscan: fix sane_reclaim helper for legacy memcg
        lib/iommu-common.c: do not try to deref a null iommu->lazy_flush() pointer when n < pool->hint
        x86, efi, kasan: #undef memset/memcpy/memmove per arch
        mm: migrate: hugetlb: putback destination hugepage to active list
        mm, dax: VMA with vm_ops->pfn_mkwrite wants to be write-notified
        userfaultfd: register uapi generic syscall (aarch64)
        userfaultfd: selftest: don't error out if pthread_mutex_t isn't identical
        userfaultfd: selftest: return an error if BOUNCE_VERIFY fails
        userfaultfd: selftest: avoid my_bcmp false positives with powerpc
        userfaultfd: selftest: only warn if __NR_userfaultfd is undefined
        userfaultfd: selftest: headers fixup
        userfaultfd: selftests: vm: pick up sanitized kernel headers
        userfaultfd: revert "userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key"
      bfbaa60d
    • D
      Merge tag 'drm-intel-fixes-2015-09-24' of git://anongit.freedesktop.org/drm-intel into drm-fixes · fd03420b
      Dave Airlie 提交于
      a few drm/i915 fixes, including a fix to the recent regression
      reported by Sedat Dilek
      
      * tag 'drm-intel-fixes-2015-09-24' of git://anongit.freedesktop.org/drm-intel:
        drm/i915/bios: handle MIPI Sequence Block v3+ gracefully
        drm/i915: Add primary plane to mask if it's visible
        drm/i915: workaround bad DSL readout v3
        drm/i915: fix kernel-doc warnings in intel_audio.c
      fd03420b
    • L
      Merge tag 'spi-fix-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · d5fc4f55
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "A disappointingly large collection of fixes for SPI issues, though
        almost all in drivers (and there mainly the newly added Mediatek
        driver) and the core fixes are documentation and error handling.
      
        The driver fixes are all of the usual 'important if you see them'
        variety"
      
      * tag 'spi-fix-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: xtensa-xtfpga: fix register endianness
        spi: meson: Fix module autoload for OF platform driver
        spi: mediatek: fix wrong error return value on probe
        spi: fix kernel-doc warnings in spi.h
        spi: spidev: fix possible NULL dereference
        spi: atmel: remove warning when !CONFIG_PM_SLEEP
        spi: bcm2835: BUG: fix wrong use of PAGE_MASK
        spi: mediatek: fix spi cs polarity error
        spi: Fix documentation of spi_alloc_master()
        spi: spi-pxa2xx: Check status register to determine if SSSR_TINT is disabled
        spi: Mediatek: Document devicetree bindings update for spi bus
        spi: mediatek: fix spi clock usage error
        spi: mediatek: remove clk_disable_unprepare()
      d5fc4f55
    • L
      Merge tag 'regulator-fix-v4.3-rc2' of... · bbad8220
      Linus Torvalds 提交于
      Merge tag 'regulator-fix-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fixes from Mark Brown:
       "A collection of fixes that came in since I tagged the merge window
        pull request for v4.3:
      
         - Error handling fixes in the core
      
         - Fixes to a couple of TI drivers for device specific issues
      
         - Several fixes for module autoloading"
      
      * tag 'regulator-fix-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: vexpress: Fix module autoload for OF platform driver
        regulator: gpio: Fix module autoload for OF platform driver
        regulator: anatop: Fix module autoload for OF platform driver
        regulator: core: Correct return value check in regulator_resolve_supply
        regulator: tps65218: Fix missing zero typo
        regulator: pbias: program pbias register offset in pbias driver
        regulator: core: fix possible NULL dereference
      bbad8220
    • L
      Merge tag 'dm-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 5146c8e4
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
       "Two stable@ fixes:
      
         - DM thinp fix to properly advertise discard support as disabled for
           thin devices backed by a thin-pool with discard support disabled.
      
         - DM crypt fix to prevent the creation of bios that violate the
           underlying block device's max_segments limits.  This fixes a
           relatively long-standing NCQ SSD corruption issue reported against
           dm-crypt ever since the dm-crypt cpu parallelization patches were
           merged back in 4.0"
      
      * tag 'dm-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm crypt: constrain crypt device's max_segment_size to PAGE_SIZE
        dm thin: disable discard support for thin devices if pool's is disabled
      5146c8e4
  3. 24 9月, 2015 29 次提交