1. 13 Oct, 2016 2 commits
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.9-1' of... · 44dc8c9d
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.9-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform drivers updates from Darren Hart:
       "Cleanups, refactoring, and a couple bug fixes.
      
        intel_pmc_core:
         - avoid boot time warning for !CONFIG_DEBUGFS_FS
      
        intel_pmc_ipc:
         - Convert to use platform_device_register_full
      
        asus-wmi:
         - Filter buggy scan codes on ASUS Q500A
      
        toshiba_bluetooth:
         - Decouple an error checking status code
      
        toshiba_haps:
         - Change logging level from info to debug
         - Split ACPI and HDD protection error handling
      
        asus-laptop:
         - get rid of parse_arg()
      
        asus-wmi:
         - fix asus ux303ub brightness issue
      
        toshiba_acpi:
         - Fix typo in *_cooling_method_set function
         - Change error checking logic from TCI functions
         - Clean up variable declaration"
      
      * tag 'platform-drivers-x86-v4.9-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        platform/x86: intel_pmc_core: avoid boot time warning for !CONFIG_DEBUGFS_FS
        platform/x86: intel_pmc_ipc: Convert to use platform_device_register_full
        platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A
        platform/x86: toshiba_bluetooth: Decouple an error checking status code
        platform/x86: toshiba_haps: Change logging level from info to debug
        platform/x86: toshiba_haps: Split ACPI and HDD protection error handling
        platform/x86: asus-laptop: get rid of parse_arg()
        platform/x86: asus-wmi: fix asus ux303ub brightness issue
        platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function
        platform/x86: toshiba_acpi: Change error checking logic from TCI functions
        platform/x86: toshiba_acpi: Clean up variable declaration
      44dc8c9d
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · e3799a21
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
      
       - a new watchdog pretimeout governor framework
      
       - support to upload the firmware on the ziirave_wdt
      
       - several fixes and cleanups
      
      * git://www.linux-watchdog.org/linux-watchdog: (26 commits)
        watchdog: imx2_wdt: add pretimeout function support
        watchdog: softdog: implement pretimeout support
        watchdog: pretimeout: add pretimeout_available_governors attribute
        watchdog: pretimeout: add option to select a pretimeout governor in runtime
        watchdog: pretimeout: add panic pretimeout governor
        watchdog: pretimeout: add noop pretimeout governor
        watchdog: add watchdog pretimeout governor framework
        watchdog: hpwdt: add support for iLO5
        fs: compat_ioctl: add pretimeout functions for watchdogs
        watchdog: add pretimeout support to the core
        watchdog: imx2_wdt: use preferred BIT macro instead of open coded values
        watchdog: st_wdt: Remove support for obsolete platforms
        watchdog: bindings: Remove obsolete platforms from dt doc.
        watchdog: mt7621_wdt: Remove assignment of dev pointer
        watchdog: rt2880_wdt: Remove assignment of dev pointer
        watchdog: constify watchdog_ops structures
        watchdog: tegra: constify watchdog_ops structures
        watchdog: iTCO_wdt: constify iTCO_wdt_pm structure
        watchdog: cadence_wdt: Fix the suspend resume
        watchdog: txx9wdt: Add missing clock (un)prepare calls for CCF
        ...
      e3799a21
  2. 12 Oct, 2016 9 commits
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.9-rc1' of... · b67be92f
      Linus Torvalds authored
      Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This set of changes contains support for PWM signal capture in the STi
        driver as well as support for the PWM controller found on Meson SoCs.
        There's also support added for the MediaTek MT2701 and SunXi H3 to the
        existing drivers.
      
        Other than that there's a fair set of miscellaneous cleanups and fixes
        across the board"
      
      * tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (24 commits)
        pwm: meson: Handle unknown ID values
        pwm: sti: Take the opportunity to conduct a little house keeping
        pwm: sti: It's now valid for number of PWM channels to be zero
        pwm: sti: Add PWM capture callback
        pwm: sti: Add support for PWM capture interrupts
        pwm: sti: Initialise PWM capture device data
        pwm: sti: Supply PWM Capture clock handling
        pwm: sti: Supply PWM capture register addresses and bit locations
        pwm: sti: Only request clock rate when needed
        pwm: sti: Reorganise register names in preparation for new functionality
        pwm: sti: Rename channel => device
        dt-bindings: pwm: sti: Update DT bindings for capture support
        pwm: lpc-18xx: use pwm_set_chip_data
        pwm: sunxi: Add H3 support
        pwm: Add support for Meson PWM Controller
        dt-bindings: pwm: Add bindings for Meson PWM Controller
        pwm: samsung: Fix to use lowest div for large enough modulation bits
        pwm: pwm-tipwmss: Remove all runtime PM gets/puts
        pwm: cros-ec: Add __packed to prevent padding
        pwm: Add MediaTek MT2701 display PWM driver support
        ...
      b67be92f
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2d2474a1
      Linus Torvalds authored
      Pull thermal managament updates from Zhang Rui:
      
       - Enhance thermal "userspace" governor to export the reason when a
         thermal event is triggered and delivered to user space. From Srinivas
         Pandruvada
      
       - Introduce a single TSENS thermal driver for the different versions of
         the TSENS IP that exist, on different qcom msm/apq SoCs'. Support for
         msm8916, msm8960, msm8974 and msm8996 families is also added. From
         Rajendra Nayak
      
       - Introduce hardware-tracked trip points support to the device tree
         thermal sensor framework. The framework supports an arbitrary number
         of trip points. Whenever the current temperature is changed, the trip
         points immediately below and above the current temperature are found,
         driver callback is invoked to program the hardware to get notified
         when either of the two trip points are triggered. Hardware-tracked
         trip points support for rockchip thermal driver is also added at the
         same time. From Sascha Hauer, Caesar Wang
      
       - Introduce a new thermal driver, which enables TMU (Thermal Monitor
         Unit) on QorIQ platform. From Jia Hongtao
      
       - Introduce a new thermal driver for Maxim MAX77620. From Laxman
         Dewangan
      
       - Introduce a new thermal driver for Intel platforms using WhiskeyCove
         PMIC. From Bin Gao
      
       - Add mt2701 chip support to MTK thermal driver. From Dawei Chien
      
       - Enhance Tegra thermal driver to enable soctherm node and set
         "critical", "hot" trips, for Tegra124, Tegra132, Tegra210. From Wei
         Ni
      
       - Add resume support for tango thermal driver. From Marc Gonzalez
      
       - several small fixes and improvements for rockchip, qcom, imx, rcar,
         mtk thermal drivers and thermal core code. From Caesar Wang, Keerthy,
         Rocky Hao, Wei Yongjun, Peter Robinson, Bui Duc Phuc, Axel Lin, Hugh
         Kang
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (48 commits)
        thermal: int3403: Process trip change notification
        thermal: int340x: New Interface to read trip and notify
        thermal: user_space gov: Add additional information in uevent
        thermal: Enhance thermal_zone_device_update for events
        arm64: tegra: set hot trips for Tegra210
        arm64: tegra: set critical trips for Tegra210
        arm64: tegra: add soctherm node for Tegra210
        arm64: tegra: set hot trips for Tegra132
        arm64: tegra: set critical trips for Tegra132
        arm64: tegra: use tegra132-soctherm for Tegra132
        arm: tegra: set hot trips for Tegra124
        arm: tegra: set critical trips for Tegra124
        thermal: tegra: add hw-throttle for Tegra132
        thermal: tegra: add hw-throttle function
        of: Add bindings of hw throttle for Tegra soctherm
        thermal: mtk_thermal: Check return value of devm_thermal_zone_of_sensor_register
        thermal: Add Mediatek thermal driver for mt2701.
        dt-bindings: thermal: Add binding document for Mediatek thermal controller
        thermal: max77620: Add thermal driver for reporting junction temp
        thermal: max77620: Add DT binding doc for thermal driver
        ...
      2d2474a1
    • Linus Torvalds's avatar
      Merge tag 'fbdev-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 084165a3
      Linus Torvalds authored
      Pull fbdev updates from Tomi Valkeinen:
       "Main changes:
      
         - amba-cldc: DT backlight support, Nomadik support, Versatile
           improvements, fixes
      
         - efifb: fix fbcon RGB565 palette
      
         - exynos: remove unused DSI driver"
      
      * tag 'fbdev-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (42 commits)
        video: smscufx: remove unused variable
        matroxfb: fix size of memcpy
        fbdev: ssd1307fb: fix a possible NULL dereference
        fbdev: ssd1307fb: constify the device_info pointer
        simplefb: Disable and release clocks and regulators in destroy callback
        video: fbdev: constify fb_fix_screeninfo and fb_var_screeninfo structures
        matroxfb: constify local structures
        video: fbdev: i810: add in missing white space in error message text
        video: fbdev: add missing \n at end of printk error message
        ARM: exynos_defconfig: Remove old non-working MIPI driver
        video: fbdev: exynos: Remove old non-working MIPI driver
        omapfb: fix return value check in dsi_bind()
        MAINTAINERS: update fbdev entries
        video: fbdev: offb: Call pci_enable_device() before using the PCI VGA device
        fbdev: vfb: simplify memory management
        fbdev: vfb: add option for video mode
        fbdev: vfb: add description to module parameters
        video: fbdev: intelfb: remove impossible condition
        fb: adv7393: off by one in probe function
        video: fbdev: pxafb: add missing of_node_put() in of_get_pxafb_mode_info()
        ...
      084165a3
    • Linus Torvalds's avatar
      Disable the __builtin_return_address() warning globally after all · ef6000b4
      Linus Torvalds authored
      This affectively reverts commit 377ccbb4 ("Makefile: Mute warning
      for __builtin_return_address(>0) for tracing only") because it turns out
      that it really isn't tracing only - it's all over the tree.
      
      We already also had the warning disabled separately for mm/usercopy.c
      (which this commit also removes), and it turns out that we will also
      want to disable it for get_lock_parent_ip(), that is used for at least
      TRACE_IRQFLAGS.  Which (when enabled) ends up being all over the tree.
      
      Steven Rostedt had a patch that tried to limit it to just the config
      options that actually triggered this, but quite frankly, the extra
      complexity and abstraction just isn't worth it.  We have never actually
      had a case where the warning is actually useful, so let's just disable
      it globally and not worry about it.
      Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Peter Anvin <hpa@zytor.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ef6000b4
    • Arnd Bergmann's avatar
      platform/x86: intel_pmc_core: avoid boot time warning for !CONFIG_DEBUGFS_FS · 127595ed
      Arnd Bergmann authored
      While looking at a patch that introduced a compile-time warning
      "‘pmc_core_dev_state_get’ defined but not used" (I sent a patch
      for debugfs to fix it), I noticed that the same patch caused
      it in intel_pmc_core also introduced a bogus run-time warning:
      "PMC Core: debugfs register failed".
      
      The problem is the IS_ERR_OR_NULL() check that as usual gets
      things wrong: when CONFIG_DEBUGFS_FS is disabled,
      debugfs_create_dir() fails with an error code, and we don't
      need to warn about it, unlike the case in which it returns
      NULL.
      
      This reverts the driver to the previous state of not warning
      about CONFIG_DEBUGFS_FS being disabled. I chose not to
      restore the driver to making a runtime error in debugfs
      fatal in pmc_core_probe().
      
      Fixes: df2294fb ("intel_pmc_core: Convert to DEFINE_DEBUGFS_ATTRIBUTE")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      127595ed
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 1573d2ca
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "Some final updates and fixes for this merge window for the parisc
        architecture. Changes include:
      
         - Fix boot problems with new memblock allocator on rp3410 machine
      
         - Increase initial kernel mapping size for 32- and 64-bit kernels,
           this allows to boot bigger kernels which have many modules built-in
      
         - Fix kernel layout regarding __gp and move exception table into RO
           section
      
         - Show trap names in crashes, use extable.h header instead of
           module.h"
      
      * 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Show trap name in kernel crash
        parisc: Zero-initialize newly alloced memblock
        parisc: Move exception table into read-only section
        parisc: Fix kernel memory layout regarding position of __gp
        parisc: Increase initial kernel mapping size
        parisc: Migrate exception table users off module.h and onto extable.h
      1573d2ca
    • Linus Torvalds's avatar
      Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 4cdf8dbe
      Linus Torvalds authored
      Pull uaccess.h prepwork from Al Viro:
       "Preparations to tree-wide switch to use of linux/uaccess.h (which,
        obviously, will allow to start unifying stuff for real). The last step
        there, ie
      
          PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
          sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
                  `git grep -l "$PATT"|grep -v ^include/linux/uaccess.h`
      
        is not taken here - I would prefer to do it once just before or just
        after -rc1.  However, everything should be ready for it"
      
      * 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        remove a stray reference to asm/uaccess.h in docs
        sparc64: separate extable_64.h, switch elf_64.h to it
        score: separate extable.h, switch module.h to it
        mips: separate extable.h, switch module.h to it
        x86: separate extable.h, switch sections.h to it
        remove stray include of asm/uaccess.h from cacheflush.h
        mn10300: remove a bogus processor.h->uaccess.h include
        xtensa: split uaccess.h into C and asm sides
        bonding: quit messing with IOCTL
        kill __kernel_ds_p off
        mn10300: finish verify_area() off
        frv: move HAVE_ARCH_UNMAPPED_AREA to pgtable.h
        exceptions: detritus removal
      4cdf8dbe
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux · 6b25e21f
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "Core:
         - Fence destaging work
         - DRIVER_LEGACY to split off legacy drm drivers
         - drm_mm refactoring
         - Splitting drm_crtc.c into chunks and documenting better
         - Display info fixes
         - rbtree support for prime buffer lookup
         - Simple VGA DAC driver
      
        Panel:
         - Add Nexus 7 panel
         - More simple panels
      
        i915:
         - Refactoring GEM naming
         - Refactored vma/active tracking
         - Lockless request lookups
         - Better stolen memory support
         - FBC fixes
         - SKL watermark fixes
         - VGPU improvements
         - dma-buf fencing support
         - Better DP dongle support
      
        amdgpu:
         - Powerplay for Iceland asics
         - Improved GPU reset support
         - UVD/VEC powergating support for CZ/ST
         - Preinitialised VRAM buffer support
         - Virtual display support
         - Initial SI support
         - GTT rework
         - PCI shutdown callback support
         - HPD IRQ storm fixes
      
        amdkfd:
         - bugfixes
      
        tilcdc:
         - Atomic modesetting support
      
        mediatek:
         - AAL + GAMMA engine support
         - Hook up gamma LUT
         - Temporal dithering support
      
        imx:
         - Pixel clock from devicetree
         - drm bridge support for LVDS bridges
         - active plane reconfiguration
         - VDIC deinterlacer support
         - Frame synchronisation unit support
         - Color space conversion support
      
        analogix:
         - PSR support
         - Better panel on/off support
      
        rockchip:
         - rk3399 vop/crtc support
         - PSR support
      
        vc4:
         - Interlaced vblank timing
         - 3D rendering CPU overhead reduction
         - HDMI output fixes
      
        tda998x:
         - HDMI audio ASoC support
      
        sunxi:
         - Allwinner A33 support
         - better TCON support
      
        msm:
         - DT binding cleanups
         - Explicit fence-fd support
      
        sti:
         - remove sti415/416 support
      
        etnaviv:
         - MMUv2 refactoring
         - GC3000 support
      
        exynos:
         - Refactoring HDMI DCC/PHY
         - G2D pm regression fix
         - Page fault issues with wait for vblank
      
        There is no nouveau work in this tree, as Ben didn't get a pull
        request in, and he was fighting moving to atomic and adding mst
        support, so maybe best it waits for a cycle"
      
      * tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux: (1412 commits)
        drm/crtc: constify drm_crtc_index parameter
        drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next
        drm/i915/guc: Unwind GuC workqueue reservation if request construction fails
        drm/i915: Reset the breadcrumbs IRQ more carefully
        drm/i915: Force relocations via cpu if we run out of idle aperture
        drm/i915: Distinguish last emitted request from last submitted request
        drm/i915: Allow DP to work w/o EDID
        drm/i915: Move long hpd handling into the hotplug work
        drm/i915/execlists: Reinitialise context image after GPU hang
        drm/i915: Use correct index for backtracking HUNG semaphores
        drm/i915: Unalias obj->phys_handle and obj->userptr
        drm/i915: Just clear the mmiodebug before a register access
        drm/i915/gen9: only add the planes actually affected by ddb changes
        drm/i915: Allow PCH DPLL sharing regardless of DPLL_SDVO_HIGH_SPEED
        drm/i915/bxt: Fix HDMI DPLL configuration
        drm/i915/gen9: fix the watermark res_blocks value
        drm/i915/gen9: fix plane_blocks_per_line on watermarks calculations
        drm/i915/gen9: minimum scanlines for Y tile is not always 4
        drm/i915/gen9: fix the WaWmMemoryReadLatency implementation
        drm/i915/kbl: KBL also needs to run the SAGV code
        ...
      6b25e21f
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · a379f71a
      Linus Torvalds authored
      Merge more updates from Andrew Morton:
      
       - a few block updates that fell in my lap
      
       - lib/ updates
      
       - checkpatch
      
       - autofs
      
       - ipc
      
       - a ton of misc other things
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
        mm: split gfp_mask and mapping flags into separate fields
        fs: use mapping_set_error instead of opencoded set_bit
        treewide: remove redundant #include <linux/kconfig.h>
        hung_task: allow hung_task_panic when hung_task_warnings is 0
        kthread: add kerneldoc for kthread_create()
        kthread: better support freezable kthread workers
        kthread: allow to modify delayed kthread work
        kthread: allow to cancel kthread work
        kthread: initial support for delayed kthread work
        kthread: detect when a kthread work is used by more workers
        kthread: add kthread_destroy_worker()
        kthread: add kthread_create_worker*()
        kthread: allow to call __kthread_create_on_node() with va_list args
        kthread/smpboot: do not park in kthread_create_on_cpu()
        kthread: kthread worker API cleanup
        kthread: rename probe_kthread_data() to kthread_probe_data()
        scripts/tags.sh: enable code completion in VIM
        mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
        kdump, vmcoreinfo: report memory sections virtual addresses
        ipc/sem.c: add cond_resched in exit_sme
        ...
      a379f71a
  3. 11 Oct, 2016 29 commits