1. 12 Nov, 2014 1 commit
  2. 10 Nov, 2014 5 commits
  3. 07 Nov, 2014 1 commit
  4. 06 Nov, 2014 11 commits
  5. 05 Nov, 2014 9 commits
  6. 04 Nov, 2014 6 commits
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · a1cff6e2
      Linus Torvalds authored
      Pull thermal fixes from Eduardo Valentin:
       "Specifics:
         - a few code fixes improving the Exynos code base.  They remove dead
           and unreachable code.  No functional changes here
         - in Exynos code base, fixes regarding the right usage of features
           (TRIMINFO and TRIMRELOAD)
         - documentation of RCAR thermal
         - fix in the of-thermal, regarding the proper usage of of-APIs
         - fixes on thermal-core, removal of unreachable code"
      
      [ Eduardo is sending the thermal fixes on behalf of Rui Zhang this time.
        Rui is currently unable to send pull requests due to troubles with his
        machine and he's currently in a business trip ]
      
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        Thermal:Remove usless if(!result) before return tz
        thermal: exynos: fix IRQ clearing on TMU initialization
        thermal: fix multiple disbalanced device node counters
        thermal: rcar: Add binding docs for new R-Car Gen2 SoCs
        thermal: exynos: Add support for TRIM_RELOAD feature at Exynos3250
        thermal: exynos: Add support for many TRIMINFO_CTRL registers
        thermal: samsung: Exynos5260 and Exynos5420 should not use TRIM_RELOAD flag
        thermal: exynos: remove identical values from exynos*_tmu_registers structures
        thermal: exynos: remove redundant pdata checks from exynos_tmu_control()
        thermal: exynos: cache non_hw_trigger_levels in pdata
        thermal: exynos: simplify temp_to_code() and code_to_temp()
        thermal: exynos: remove redundant threshold_code checks from exynos_tmu_initialize()
        thermal: exynos: remove redundant pdata checks from exynos_tmu_initialize()
        thermal: exynos: remove dead code for HW_MODE calibration
        thermal: exynos: remove unused struct exynos_tmu_registers entries
      a1cff6e2
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v3.18-2' of... · 9319bc1c
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v3.18-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform drievr updates from Darren Hart:
       "A short list of patches applying quirks and new DMI matches.  These
        pass my basic build tests and have spent 4 days in linux-next"
      
      * tag 'platform-drivers-x86-v3.18-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        quirk for Lenovo Yoga 3: no rfkill switch
        acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80
        samsung-laptop: Add broken-acpi-video quirk for NC210/NC110
        asus-nb-wmi: Add wapf4 quirk for the X550VB
        toshiba_acpi: Add Toshiba TECRA A50-A to the alt keymap dmi list
      9319bc1c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 8a97577a
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Some more powerpc fixes if you please"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc: use device_online/offline() instead of cpu_up/down()
        powerpc/powernv: Properly fix LPC debugfs endianness
        powerpc: do_notify_resume can be called with bad thread_info flags argument
        powerpc/fadump: Fix endianess issues in firmware assisted dump handling
        powerpc: Fix section mismatch warning
      8a97577a
    • Linus Torvalds's avatar
      Merge tag 'ftracetest-3.18-rc1' of... · 1efa82ec
      Linus Torvalds authored
      Merge tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull ftracetest fix from Steven Rostedt:
       "Running the ftracetests on a machine that had the debugfs file system
        mounted in two locations caused the ftracetests to fail.  This is
        because the ftracetests script does a grep of the /proc/mounts file to
        find where the debugfs file system is mounted.  If it is mounted
        twice, then the grep returns two lines instead of just one.  This
        causes the ftracetests to get confused and fail.
      
        Use "head -1" to only return the first mount point for debugfs"
      
      * tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftracetest: Take the first debugfs mount found
      1efa82ec
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 980d0d51
      Linus Torvalds authored
      Pull pin-control fixes from Linus Walleij:
       "This kernel cycle has been calm for both pin control and GPIO so far
        but here are three pin control patches for you anyway, only really
        dealing with Baytrail:
      
         - Two fixes for the Baytrail driver affecting IRQs and output state
           in sysfs
         - Use the linux-gpio mailing list also for pinctrl patches"
      
      * tag 'pinctrl-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
        pinctrl: use linux-gpio mailing list
        pinctrl: baytrail: Clear DIRECT_IRQ bit
      980d0d51
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · f3ed88a6
      Linus Torvalds authored
      Pull CMA and DMA-mapping fixes from Marek Szyprowski:
       "This contains important fixes for recently introduced highmem support
        for default contiguous memory region used for dma-mapping subsystem"
      
      * 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        mm, cma: make parameters order consistent in func declaration and definition
        mm: cma: Use %pa to print physical addresses
        mm: cma: Ensure that reservations never cross the low/high mem boundary
        mm: cma: Always consider a 0 base address reservation as dynamic
        mm: cma: Don't crash on allocation if CMA area can't be activated
      f3ed88a6
  7. 03 Nov, 2014 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · ce1928da
      Linus Torvalds authored
      Pull ceph fixes from Sage Weil:
       "There is a GFP flag fix from Mike Christie, an error code fix from
        Jan, and fixes for two unnecessary allocations (kmalloc and workqueue)
        from Ilya.  All are well tested.
      
        Ilya has one other fix on the way but it didn't get tested in time"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: eliminate unnecessary allocation in process_one_ticket()
        rbd: Fix error recovery in rbd_obj_read_sync()
        libceph: use memalloc flags for net IO
        rbd: use a single workqueue for all devices
      ce1928da
    • Yao Dongdong's avatar
      Thermal:Remove usless if(!result) before return tz · 14015860
      Yao Dongdong authored
      result is always zero when comes here.
      Signed-off-by: default avatarYao Dongdong <yaodongdong@huawei.com>
      Acked-by: default avatarEduardo Valentin <edubezval@gmail.com>
      Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
      14015860
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · f4ca536f
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      Just wiring up the bpf system call.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Wire up bpf
      f4ca536f
    • Linus Torvalds's avatar
      Merge tag 'armsoc-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2084becb
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A surprisingly small batch of fixes for -rc3.  Suspiciously small, I'd
        say.
      
        Anyway, most of this are a few defconfig updates.  Some for omap to
        deal with kernel binary size (moving ipv6 to module, etc).  A larger
        one for socfpga that refreshes with some churn, but also turns on a
        few options that makes the newly-added board in my bootfarm usable for
        testing.
      
        OMAP3 will also now warn when booted with legacy (non-DT) boot
        protocols, hopefully encouraging those who still care about some of
        those platforms to submit DT support and report bugs where needed.
        Nothing stops working though, this is just to warn for future
        deprecation.
      
        Beyond this, very few actual bugfixes.  A PXA fix for DEBUG_LL boot
        hangs, a missing terminting entry in a dt_match array on RealView a
        MTD fix on OMAP with NAND"
      
      [ Obviously missed rc3, will make rc4 instead ;) ]
      
      * tag 'armsoc-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: drop list entry for davinci
        ARM: OMAP2+: Warn about deprecated legacy booting mode
        ARM: omap2plus_defconfig: Fix errors with NAND BCH
        ARM: multi_v7_defconfig: fix support for APQ8084
        soc: versatile: Add terminating entry for realview_soc_of_match
        ARM: ixp4xx: remove compilation warnings in io.h
        MAINTAINERS: Add Soren as reviewer for Zynq
        ARM: omap2plus_defconfig: Fix bloat caused by having ipv6 built-in
        ARM: socfpga_defconfig: Update defconfig for SoCFPGA
        ARM: pxa: fix hang on startup with DEBUG_LL
      2084becb
    • Steven Rostedt (Red Hat)'s avatar
      ftracetest: Take the first debugfs mount found · e7dbb489
      Steven Rostedt (Red Hat) authored
      Running ftracetests on a box that mounted debugfs in two locations
      made the ftracetests fail. This is because the tests uses a grep
      of debugfs from the /proc/mounts file to find the debugfs mount
      point, and then appends "/tracing" to that string to get the tracing
      directory.
      
      If the debugfs directory is mounted twice, then that grep will return
      two answers and appending "/tracing" to a string with two lines will
      not work.
      
      Use "head -1" to only take the first mount point found.
      Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      e7dbb489
    • Bartlomiej Zolnierkiewicz's avatar
      thermal: exynos: fix IRQ clearing on TMU initialization · b835ced1
      Bartlomiej Zolnierkiewicz authored
      * Factor out code for clearing raised IRQs from exynos_tmu_work() to
        exynos_tmu_clear_irqs().
      
      * Add a comment about documentation bugs to exynos_tmu_clear_irqs().
      
        [ The documentation for Exynos3250, Exynos4412, Exynos5250 and
          Exynos5260 incorrectly states that INTCLEAR register has
          a different placing of bits responsible for FALL IRQs than
          INTSTAT register.  Exynos5420 and Exynos5440 documentation is
          correct (Exynos4210 doesn't support FALL IRQs at all). ]
      
      * Use exynos_tmu_clear_irqs() in exynos_tmu_initialize() instead
        of open-coded code trying to clear IRQs according to predefined
        masks.  After this change exynos_tmu_initialize() just clears
        IRQs that are raised like it is already done in exynos_tmu_work().
      
        As a nice side-effect the code now uses the correct offset
        (16 instead of 12) for bits responsible for clearing FALL IRQs
        in INTCLEAR register on Exynos3250, Exynos4412 and Exynos5250.
      
      * Remove no longer needed intclr_rise_[mask,shift] and
        intclr_fall_[mask,shift] fields from struct exynos_tmu_registers.
      
      * Remove no longer needed defines.
      
      This patch has been tested on Exynos4412 and Exynos5420 SoCs.
      
      Cc: Amit Daniel Kachhap <amit.daniel@samsung.com>
      Cc: Lukasz Majewski <l.majewski@samsung.com>
      Cc: Eduardo Valentin <edubezval@gmail.com>
      Cc: Zhang Rui <rui.zhang@intel.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
      b835ced1
    • Vladimir Zapolskiy's avatar
      thermal: fix multiple disbalanced device node counters · c2aad93c
      Vladimir Zapolskiy authored
      Here on function return all temporarily used device nodes shall
      decrement their usage counter. The problems are found with device
      nodes allocated by for_each_child_of_node(), of_parse_phandle()
      and of_find_node_by_name(), fix all problems at once.
      Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
      Cc: devicetree@vger.kernel.org
      Cc: Zhang Rui <rui.zhang@intel.com>
      Cc: Eduardo Valentin <edubezval@gmail.com>
      Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
      c2aad93c