1. 30 12月, 2014 4 次提交
    • L
      Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 034496f4
      Linus Torvalds 提交于
      Pull one regulator fix from Mark Brown:
       "One fix here, a fix for the voltage mapping on one of the s2mps11
        regulators which broke systems using it including apparently the
        Gear 2 smartwatches"
      
      * tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: s2mps11: Fix dw_mmc failure on Gear 2
      034496f4
    • L
      Merge tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc · 5e6c2c97
      Linus Torvalds 提交于
      Pull one MMC fix from Ulf Hansson:
       "MMC core:
      
         - Fix selection of buswidth for mmc hosts supporting 1-bit only"
      
      * tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: core: stop trying to switch width when only one bit is supported
      5e6c2c97
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 4c5d4995
      Linus Torvalds 提交于
      Pull thermal management updates from Zhang Rui:
       "First of all, the most important change is the thermal cpu cooling
        fixes.  The major fix here is to have proper sequencing between
        cpufreq layer and thermal cpu cooling registration.  A take away of
        this fix is an improvement in the thermal drivers code.  Thermal
        drivers that require cpu cooling do not need to check for cpufreq
        layer.  The requirement now is to propagate the error code, if any,
        while registering cpu cooling device.  Thanks to Viresh for
        implementing the required CPUfreq changes.
      
        Second, a new driver is introduced for int340x processor thermal
        device.  Given that int340x thermal is disabled by default, and this
        processor thermal device is only available on limited platforms, plus
        the driver does nothing but exposes some thermal limitation
        information for user space to use, thus I think it is safe to include
        it in this pull request after missing 3.19-rc2.
      
        Specifics:
      
         - Thermal cpu cooling fixes and cleanups.
      
         - introduce INT340X processor thermal reporting device driver.
      
         - several small fixes and cleanups for int340x thermal drivers"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (43 commits)
        Thermal/int340x/int3403: Free acpi notification handler
        Thermal/int340x/processor_thermal: Fix memory leak
        Thermal/int340x/int3403: Fix memory leak
        thermal: int340x: Introduce processor reporting device
        thermal: int340x_thermal: drop owner assignment from platform_drivers
        thermal: drop owner assignment from platform_drivers
        thermal: cpu_cooling: document node in struct cpufreq_cooling_device
        thermal/powerclamp: add ids for future xeon cpus
        Thermal/int340x: Handle properly the case when _trt or _art acpi entry is missing
        thermal: cpu_cooling: return ERR_PTR() for !CPU_THERMAL or !THERMAL_OF
        thermal: cpu_cooling: small memory leak on error
        thermal: ti-soc-thermal: Do not print error message in the EPROBE_DEFER case
        thermal: db8500: Do not print error message in the EPROBE_DEFER case
        thermal: imx: Do not print error message in the EPROBE_DEFER case
        thermal: Fix cdev registration with THERMAL_NO_LIMIT on 64bit
        drivers: thermal: Remove ARCH_HAS_BANDGAP dependency for samsung
        thermal:core:fix: Check return code of the ->get_max_state() callback
        thermal: cpu_cooling: update copyright tags
        thermal: cpu_cooling: Use cpufreq_dev->freq_table for finding level/freq
        thermal: cpu_cooling: Store frequencies in descending order
        ...
      4c5d4995
    • M
      mm: get rid of radix tree gfp mask for pagecache_get_page · 45f87de5
      Michal Hocko 提交于
      Commit 2457aec6 ("mm: non-atomically mark page accessed during page
      cache allocation where possible") has added a separate parameter for
      specifying gfp mask for radix tree allocations.
      
      Not only this is less than optimal from the API point of view because it
      is error prone, it is also buggy currently because
      grab_cache_page_write_begin is using GFP_KERNEL for radix tree and if
      fgp_flags doesn't contain FGP_NOFS (mostly controlled by fs by
      AOP_FLAG_NOFS flag) but the mapping_gfp_mask has __GFP_FS cleared then
      the radix tree allocation wouldn't obey the restriction and might
      recurse into filesystem and cause deadlocks.  This is the case for most
      filesystems unfortunately because only ext4 and gfs2 are using
      AOP_FLAG_NOFS.
      
      Let's simply remove radix_gfp_mask parameter because the allocation
      context is same for both page cache and for the radix tree.  Just make
      sure that the radix tree gets only the sane subset of the mask (e.g.  do
      not pass __GFP_WRITE).
      
      Long term it is more preferable to convert remaining users of
      AOP_FLAG_NOFS to use mapping_gfp_mask instead and simplify this
      interface even further.
      Reported-by: NDave Chinner <david@fromorbit.com>
      Signed-off-by: NMichal Hocko <mhocko@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      45f87de5
  2. 29 12月, 2014 4 次提交
  3. 28 12月, 2014 5 次提交
  4. 27 12月, 2014 3 次提交
  5. 26 12月, 2014 4 次提交
    • L
      ALSA: hda_intel: apply the Seperate stream_tag for Skylake · d6795827
      Libin Yang 提交于
      The total stream number of Skylake's input and output stream
      exceeds 15, which will cause some streams do not work because
      of the overflow on SDxCTL.STRM field if using the legacy
      stream tag allocation method.
      
      This patch uses the new stream tag allocation method by add
      the flag AZX_DCAPS_SEPARATE_STREAM_TAG for Skylake platform.
      Signed-off-by: NLibin Yang <libin.yang@intel.com>
      Reviewed-by: NVinod Koul <vinod.koul@intel.com>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      d6795827
    • R
      ALSA: hda_controller: Separate stream_tag for input and output streams. · 93e3423e
      Rafal Redzimski 提交于
      Implemented separate stream_tag assignment for input and output streams.
      According to hda specification stream tag must be unique throughout the
      input streams group, however an output stream might use a stream tag
      which is already in use by an input stream. This change is necessary
      to support HW which provides a total of more than 15 stream DMA engines
      which with legacy implementation causes an overflow on SDxCTL.STRM
      field (and the whole SDxCTL register) and as a result usage of
      Reserved value 0 in the SDxCTL.STRM field which confuses HDA controller.
      Signed-off-by: NRafal Redzimski <rafal.f.redzimski@intel.com>
      Signed-off-by: NJayachandran B <jayachandran.b@intel.com>
      Signed-off-by: NLibin Yang <libin.yang@intel.com>
      Reviewed-by: NVinod Koul <vinod.koul@intel.com>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      93e3423e
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 08b022a9
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Xmas fixes pull:
      
        core:
            one atomic fix, revert the WARN_ON dumb buffers patch.
      
        agp:
            fixup Dave J.
      
        nouveau:
            fix 3.18 regression for old userspace
      
        tegra fixes:
            vblank and iommu fixes
      
        amdkfd:
            fix bugs shown by testing with userspace, init apertures once
      
        msm:
            hdmi fixes and cleanup
      
        i915:
            misc fixes
      
        There is also a link ordering fix that I've asked to be cc'ed to you,
        putting iommu before gpu, it fixes an issue with amdkfd when things
        are all in the kernel, but I didn't like sending it via my tree
        without discussion.
      
        I'll probably be a bit on/off for a few weeks with pulls now, due to
        holidays and LCA, so don't be surprised if stuff gets a bit backed up,
        and things end up a bit large due to lag"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (28 commits)
        Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2"
        agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags
        nouveau: bring back legacy mmap handler
        drm/msm/hdmi: rework HDMI IRQ handler
        drm/msm/hdmi: enable regulators before clocks to avoid warnings
        drm/msm/mdp5: update irqs on crtc<->encoder link change
        drm/msm: block incoming update on pending updates
        drm/atomic: fix potential null ptr on plane enable
        drm/msm: Deletion of unnecessary checks before the function call "release_firmware"
        drm/msm: Deletion of unnecessary checks before two function calls
        drm/tegra: dc: Select root window for event dispatch
        drm/tegra: gem: Use the proper size for GEM objects
        drm/tegra: gem: Flush buffer objects upon allocation
        drm/tegra: dc: Fix a potential race on page-flip completion
        drm/tegra: dc: Consistently use the same pipe
        drm/irq: Add drm_crtc_vblank_count()
        drm/irq: Add drm_crtc_handle_vblank()
        drm/irq: Add drm_crtc_send_vblank_event()
        drm/i915: Disable PSMI sleep messages on all rings around context switches
        drm/i915: Force the CS stall for invalidate flushes
        ...
      08b022a9
    • L
      Merge tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi · ebda37c9
      Linus Torvalds 提交于
      Pull ipmi driver bugfixes from Corey Minyard:
       "Fix two bugs:
      
        One that lockdep turned up, I didn't go far enough with cleanup of
        attributes for IPMI.  This has been there a long time; my previous fix
        of this didn't fix all the attributes.
      
        One fix for some arches that need an explicit linux/ctype.h for
        isspace()"
      
      * tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: Fix compile issue with isspace()
        ipmi: Finish cleanup of BMC attributes
      ebda37c9
  6. 24 12月, 2014 13 次提交
  7. 23 12月, 2014 7 次提交
    • D
      agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags · bd8136d3
      Dave Jones 提交于
      - Remove soon-to-be-dead @redhat address.
      - Jeff Hartmann wrote the bulk of the original backend code, and should
        at least get a mention in the MODULE_AUTHOR for backend.o
      - Various people at Intel have done a lot more work than myself on the
        intel-* drivers, so again, mention that.
      Signed-off-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      bd8136d3
    • L
      Merge tag 'dm-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · aa39477b
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
       "Thre stable fixes and one fix for a regression introduced during 3.19
        merge:
      
         - Fix inability to discard used space when the thin-pool target is in
           out-of-data-space mode and also transition the thin-pool back to
           write mode once free space is made available.
      
         - Fix DM core bio-based end_io bug that prevented proper
           post-processing of the error code returned from the block layer.
      
         - Fix crash in DM thin-pool due to thin device being added to the
           pool's active_thins list before properly initializing the thin
           device's refcount"
      
      * tag 'dm-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: fix missed error code if .end_io isn't implemented by target_type
        dm thin: fix crash by initializing thin device's refcount and completion earlier
        dm thin: fix missing out-of-data-space to write mode transition if blocks are released
        dm thin: fix inability to discard blocks when in out-of-data-space mode
      aa39477b
    • K
      Revert "mm/memory.c: share the i_mmap_rwsem" · 48ec833b
      Kirill A. Shutemov 提交于
      This reverts commit c8475d14.
      
      There are several[1][2] of bug reports which points to this commit as potential
      cause[3].
      
      Let's revert it until we figure out what's going on.
      
      [1] https://lkml.org/lkml/2014/11/14/342
      [2] https://lkml.org/lkml/2014/12/22/213
      [3] https://lkml.org/lkml/2014/12/9/741Signed-off-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Reported-by: NSasha Levin <sasha.levin@oracle.com>
      Acked-by: NDavidlohr Bueso <dave@stgolabs.net>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      48ec833b
    • D
      Merge tag 'drm/tegra/for-3.19-rc1-fixes' of git://people.freedesktop.org/~tagr/linux into drm-fixes · fc556fb6
      Dave Airlie 提交于
      drm/tegra: Fixes for v3.19-rc1
      
      This is a set of fixes for two regressions and one bug in the IOMMU
      mapping code. It turns out that all of these issues turn up primarily
      on Tegra30 hardware. The IOMMU mapping bug only manifests on buffers
      that aren't multiples of the page size. I happened to be testing HDMI
      with 1080p while writing the code and framebuffers for that happen to
      fit exactly within 2025 pages of 4 KiB each.
      
      One of the regressions is caused by the IOMMU code allocating pages from
      shmem which can have associated cache lines. If the pages aren't flushed
      then these cache lines may be flushed later on and cause framebuffer
      corruption. I'm not sure why I didn't see this before. Perhaps the board
      that I was using had enough RAM so that the pages shmem would hand out
      had a better chance of being unused. Or maybe I didn't look too closely.
      The fix for this is to fake up an SG table so that it can be passed to
      the DMA API. Ideally this would use drm_clflush_*(), but implementing
      that for ARM causes DRM to fail to build as a module since some of the
      low-level cache maintenance functions aren't exported. Hopefully we can
      get a suitable API exported on ARM for the next release.
      
      The second regression is caused by a mismatch between the hardware pipe
      number and the CRTC's DRM index. These were used inconsistently, which
      could cause one code location to call drm_vblank_get() with a different
      pipe than the corresponding drm_vblank_put(), thereby causing the
      reference count to become unbalanced. Alexandre also reported a possible
      race condition related to this, which this series also fixes.
      
      * tag 'drm/tegra/for-3.19-rc1-fixes' of git://people.freedesktop.org/~tagr/linux:
        drm/tegra: dc: Select root window for event dispatch
        drm/tegra: gem: Use the proper size for GEM objects
        drm/tegra: gem: Flush buffer objects upon allocation
        drm/tegra: dc: Fix a potential race on page-flip completion
        drm/tegra: dc: Consistently use the same pipe
        drm/irq: Add drm_crtc_vblank_count()
        drm/irq: Add drm_crtc_handle_vblank()
        drm/irq: Add drm_crtc_send_vblank_event()
      fc556fb6
    • D
      Merge tag 'drm-intel-next-fixes-2014-12-17' of... · a548a838
      Dave Airlie 提交于
      Merge tag 'drm-intel-next-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes
      
      misc i915 fixes.
      
      * tag 'drm-intel-next-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Disable PSMI sleep messages on all rings around context switches
        drm/i915: Force the CS stall for invalidate flushes
        drm/i915: Invalidate media caches on gen7
        drm/i915: sanitize RPS resetting during GPU reset
        drm/i915: move RPS PM_IER enabling to gen6_enable_rps_interrupts
        drm/i915: vlv: fix IRQ masking when uninstalling interrupts
      a548a838
    • D
      Merge tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 2e33054e
      Dave Airlie 提交于
      Yeah a pull for one patch is a bit overkill but I started to assemble the
      various patches for 3.20 in a branch for atomic props/ioctl and didn't
      realize that this bugfix here at the beginnning of the branch should be in
      3.19 (because msm is using the helpers arleady). So if you'd merge we'd
      have it twice or or I need to shuffle branches again. Can do if you want.
      
      * tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel:
        drm/atomic: fix potential null ptr on plane enable
      2e33054e
    • D
      Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux into drm-fixes · 955f6be8
      Dave Airlie 提交于
      A few msm fixes for 3.19:
       * hdmi regulators fix
       * hdmi fix for spurious HPD interrupts
       * fix for sync atomic update after async update (which could show
         up with a setcrtc following a pageflip)
       * couple little Coccinelle cleanups
      
      * 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux:
        drm/msm/hdmi: rework HDMI IRQ handler
        drm/msm/hdmi: enable regulators before clocks to avoid warnings
        drm/msm/mdp5: update irqs on crtc<->encoder link change
        drm/msm: block incoming update on pending updates
        drm/msm: Deletion of unnecessary checks before the function call "release_firmware"
        drm/msm: Deletion of unnecessary checks before two function calls
      955f6be8