1. 04 3月, 2015 14 次提交
  2. 03 3月, 2015 7 次提交
    • D
      Revert "drm/rockchip: Flip select/depends in Kconfig" · ed9ed50c
      Dave Airlie 提交于
      This reverts commit 9c58e8db.
      
      This doesn't seem to fully fix this, Kbuild who knows.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      ed9ed50c
    • D
      drm/rockchip: Flip select/depends in Kconfig · 9c58e8db
      Daniel Vetter 提交于
      Otherwise Kconfig gets confused and somehow ends up creating a 2nd drm
      submenu. I couldn't find i915 because of this any more at first.
      
      Cc: Andy Yan <andy.yan@rock-chips.com>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Cc: Philipp Zabel <p.zabel@pengutronix.de>
      Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
      Cc: linux-kbuild@vger.kernel.or
      Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
      Signed-off-by: NDave Airlie <airlied@gmail.com>
      9c58e8db
    • D
      Merge tag 'imx-drm-fixes-2015-02-24' of git://git.pengutronix.de/git/pza/linux into drm-fixes · 9d0685ae
      Dave Airlie 提交于
      imx-drm fixes for mode fixup, dw_hdmi/imx, and parallel-display
      
      - A clock fix for too large pixel clocks depending on the
        DI clock flag simplification patch
      - Pruning of unsupported modes and a missing end of array element
        for dw_hdmi-imx
      - LVDS modeset fix for mode fixup
      - Fix parallel-display deferred probing if drm_panel is used
      
      * tag 'imx-drm-fixes-2015-02-24' of git://git.pengutronix.de/git/pza/linux:
        DRM: i.MX: parallel display: Support probe deferral for finding DRM panel
        drm/imx: imx-ldb: enable DI clock in encoder_mode_set
        drm/imx: dw_hdmi-imx: add end of array element to current control array
        drm/imx: dw_hdmi-imx: add mode_valid callback prune unsupported modes
        gpu: ipu-v3: do not divide by zero if the pixel clock is too large
      9d0685ae
    • L
      Merge tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 023a6007
      Linus Torvalds 提交于
      Pull GPIO fixes from Linus Walleij:
       "Two GPIO fixes:
      
         - Fix a translation problem in of_get_named_gpiod_flags()
      
         - Fix a long standing container_of() mistake in the TPS65912 driver"
      
      * tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: tps65912: fix wrong container_of arguments
        gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
      023a6007
    • L
      Merge branch 'fixes-for-4.0-rc2' of... · 10d6dfc1
      Linus Torvalds 提交于
      Merge branch 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
      
      Pull thermal management fixes from Eduardo Valentin:
       "Specifics:
      
         - Several fixes in tmon tool.
      
         - Fixes in intel int340x for _ART and _TRT tables.
      
         - Add id for Avoton SoC into powerclamp driver.
      
         - Fixes in RCAR thermal driver to remove race conditions and fix fail
           path
      
         - Fixes in TI thermal driver: removal of unnecessary code and build
           fix if !CONFIG_PM_SLEEP
      
         - Cleanups in exynos thermal driver
      
         - Add stubs for include/linux/thermal.h.  Now drivers using thermal
           calls but that also work without CONFIG_THERMAL will be able to
           compile for systems that don't care about thermal.
      
        Note: I am sending this pull on Rui's behalf while he fixes issues in
        his Linux box"
      
      * 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        thermal: int340x_thermal: Ignore missing _ART, _TRT tables
        thermal/intel_powerclamp: add id for Avoton SoC
        tools/thermal: tmon: silence 'set but not used' warnings
        tools/thermal: tmon: use pkg-config to determine library dependencies
        tools/thermal: tmon: support cross-compiling
        tools/thermal: tmon: add .gitignore
        tools/thermal: tmon: fixup tui windowing calculations
        tools/thermal: tmon: tui: don't hard-code dialog window size assumptions
        tools/thermal: tmon: add min/max macros
        tools/thermal: tmon: add --target-temp parameter
        thermal: exynos: Clean-up code to use oneline entry for exynos compatible table
        thermal: rcar: Make error and remove paths symmetrical with init
        thermal: rcar: Fix race condition between init and interrupt
        thermal: Introduce dummy functions when thermal is not defined
        ti-soc-thermal: Delete an unnecessary check before the function call "cpufreq_cooling_unregister"
        thermal: ti-soc-thermal: bandgap: Fix build warning if !CONFIG_PM_SLEEP
      10d6dfc1
    • L
      Merge tag 'md/4.0-fixes' of git://neil.brown.name/md · 1a6f77ab
      Linus Torvalds 提交于
      Pull md fixes from Neil Brown:
       "Three md fixes:
      
         - fix a read-balance problem that was reported 2 years ago, but that
           I never noticed the report :-(
      
         - fix for rare RAID6 problem causing incorrect bitmap updates when
           two devices fail.
      
         - add __ATTR_PREALLOC annotation now that it is possible"
      
      * tag 'md/4.0-fixes' of git://neil.brown.name/md:
        md: mark some attributes as pre-alloc
        raid5: check faulty flag for array status during recovery.
        md/raid1: fix read balance when a drive is write-mostly.
      1a6f77ab
    • L
      Merge tag 'metag-fixes-v4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 49db1f0e
      Linus Torvalds 提交于
      Pull arch/metag fix from James Hogan:
       "This is just a single patch to fix the KSTK_EIP() and KSTK_ESP()
        macros for metag which have always been erronously returning the PC
        and stack pointer of the task's kernel context rather than from its
        user context saved at entry from userland into the kernel, which
        affects the contents of /proc/<pid>/maps and /proc/<pid>/stat"
      
      * tag 'metag-fixes-v4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: Fix KSTK_EIP() and KSTK_ESP() macros
      49db1f0e
  3. 02 3月, 2015 5 次提交
  4. 01 3月, 2015 14 次提交