1. 28 2月, 2017 3 次提交
    • D
      Merge tag 'drm-misc-next-fixes-2017-02-27' of... · a44ddbcb
      Dave Airlie 提交于
      Merge tag 'drm-misc-next-fixes-2017-02-27' of git://anongit.freedesktop.org/git/drm-misc into drm-next
      
      Misc fixes for the 4.11 merge window.
      
      - vmwgfx drm_control node compat patch
      - rockchip&zte fix
      - compat32 support for dma-buf ioctl (cc: stable ofc, since this is a
        massive fumble. oops)
      
      * tag 'drm-misc-next-fixes-2017-02-27' of git://anongit.freedesktop.org/git/drm-misc:
        dma-buf: add support for compat ioctl
        drm/vmwgfx: Work around drm removal of control nodes
        drm/rockchip: cdn-dp: Fix error handling
        drm/rockchip: add extcon dependency for DP
        drm: zte: fix static checker warning on variable 'fmt'
      a44ddbcb
    • L
      Merge tag 'trace-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 45554b23
      Linus Torvalds 提交于
      Pull another tracing update from Steven Rostedt:
       "Commit 79c6f448 ("tracing: Fix hwlat kthread migration") fixed a
        bug that was caused by a race condition in initializing the hwlat
        thread. When fixing this code, I realized that it should have been
        done differently. Instead of doing the rewrite and sending that to
        stable, I just sent the above commit to fix the bug that should be
        back ported.
      
        This commit is on top of the quick fix commit to rewrite the code the
        way it should have been written in the first place"
      
      * tag 'trace-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Clean up the hwlat binding code
      45554b23
    • L
      Merge tag 'trace-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 79b17ea7
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "This release has no new tracing features, just clean ups, minor fixes
        and small optimizations"
      
      * tag 'trace-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (25 commits)
        tracing: Remove outdated ring buffer comment
        tracing/probes: Fix a warning message to show correct maximum length
        tracing: Fix return value check in trace_benchmark_reg()
        tracing: Use modern function declaration
        jump_label: Reduce the size of struct static_key
        tracing/probe: Show subsystem name in messages
        tracing/hwlat: Update old comment about migration
        timers: Make flags output in the timer_start tracepoint useful
        tracing: Have traceprobe_probes_write() not access userspace unnecessarily
        tracing: Have COMM event filter key be treated as a string
        ftrace: Have set_graph_function handle multiple functions in one write
        ftrace: Do not hold references of ftrace_graph_{notrace_}hash out of graph_lock
        tracing: Reset parser->buffer to allow multiple "puts"
        ftrace: Have set_graph_functions handle write with RDWR
        ftrace: Reset fgd->hash in ftrace_graph_write()
        ftrace: Replace (void *)1 with a meaningful macro name FTRACE_GRAPH_EMPTY
        ftrace: Create a slight optimization on searching the ftrace_hash
        tracing: Add ftrace_hash_key() helper function
        ftrace: Convert graph filter to use hash tables
        ftrace: Expose ftrace_hash_empty and ftrace_lookup_ip
        ...
      79b17ea7
  2. 27 2月, 2017 3 次提交
    • M
      dma-buf: add support for compat ioctl · 888022c0
      Marek Szyprowski 提交于
      Add compat ioctl support to dma-buf. This lets one to use DMA_BUF_IOCTL_SYNC
      ioctl from 32bit application on 64bit kernel. Data structures for both 32
      and 64bit modes are same, so there is no need for additional translation
      layer.
      Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
      Reviewed-by: NChristian König <christian.koenig@amd.com>
      Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NSumit Semwal <sumit.semwal@linaro.org>
      Link: http://patchwork.freedesktop.org/patch/msgid/1487683261-2655-1-git-send-email-m.szyprowski@samsung.com
      888022c0
    • T
      drm/vmwgfx: Work around drm removal of control nodes · 31788ca8
      Thomas Hellstrom 提交于
      vmware tools has a daemon that gets layout information from the GUI and
      forwards it to DRM so that the modesetting code can set preferred connector
      locations and modes. This daemon was using control nodes but since control
      nodes were just removed, make it possible for the daemon to use render- or
      primary nodes instead. This is a bit ugly but will allow drm to proceed with
      removal of the mostly unused control-node code and allow vmware to proceed
      with fixing up automatic layout settings for gnome-shell/wayland.
      
      We bump minor to inform user-space about the api change.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NThomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: NSinclair Yeh <syeh@vmware.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: http://patchwork.freedesktop.org/patch/msgid/20170221104227.2854-1-thellstrom@vmware.com
      31788ca8
    • L
      Merge tag 'watchdog-for-linus-v4.11' of... · e5d56efc
      Linus Torvalds 提交于
      Merge tag 'watchdog-for-linus-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull watchdog updates from Guenter Roeck:
       "Wim asked me to handle the watchdog pull request this time around.
      
        Key changes:
      
         - New drivers: Cortina Gemini, ZTE's zx2967 family, NIC7018
      
         - Convert to use device managed functions: ebc-c384_wdt, tegra_wdt,
           da9063_wdt, da9062_wdt, da9055_wdt, da9052_wdt, bcm2835_wdt,
           mena21_wdt, wm831x_wdt, digicolor_wdt, intel-mid_wdt, meson_wdt,
           sunxi_wdt, aspeed_wdt, coh901327_wdt, iTCO_wdt
      
         - Use watchdog core to install restart handler: tangox, dw_wdt,
           bcm2835_wdt, asm9260_wdt, bcm47xx_wdt
      
         - Convert ts72xx_wdt driver to watchdog core
      
         - Let core handle heartbeat in ep93xx_wdt driver
      
         - Enable COMPILE_TEST where possible
      
         - Various other improvements"
      
      * tag 'watchdog-for-linus-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (54 commits)
        watchdog: s3c2410: Add prefix to local function
        watchdog: s3c2410: Select MFD_SYSCON on all Exynos platforms
        watchdog: s3c2410: Use dev_dbg instead of pr_info
        watchdog: s3c2410: Fix infinite interrupt in soft mode
        watchdog: s3c2410: Remove confusing CONFIG prefix from local defines
        watchdog: softdog: make pretimeout support a compile option
        watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
        dt: bindings: add documentation for zx2967 family watchdog controller
        watchdog: sama5d4: Implement resume hook
        watchdog: sama5d4: Cache MR instead of a partial config
        watchdog: ts72xx_wdt: convert driver to watchdog core
        watchdog: ep93xx_wdt: cleanup and let the core handle the heartbeat
        watchdog: RDC321X_WDT always depends on PCI
        watchdog: add driver for Cortina Gemini watchdog
        watchdog: add DT bindings for Cortina Gemini
        watchdog: constify watchdog_ops structures
        watchdog: Introduce watchdog_stop_on_unregister helper
        watchdog: ebc-c384_wdt: Utilize devm_ functions in driver probe callback
        watchdog: tegra_wdt: Convert to use device managed functions
        watchdog: da9063_wdt: Convert to use device managed functions
        ...
      e5d56efc
  3. 26 2月, 2017 12 次提交
    • L
      Merge tag 'linux-kselftest-4.11-rc1' of... · c4f3f22e
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull Kselftest update from Shuah Khan:
       "This update consists of:
      
         - fixes to several existing tests from Stafford Horne
      
         - cpufreq tests from Viresh Kumar
      
         - Selftest build and install fixes from Bamvor Jian Zhang and Michael
           Ellerman
      
         - Fixes to protection-keys tests from Dave Hansen
      
         - Warning fixes from Shuah Khan"
      
      * tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (28 commits)
        selftests/powerpc: Fix remaining fallout from recent changes
        selftests/powerpc: Fix the clean rule since recent changes
        selftests: Fix the .S and .S -> .o rules
        selftests: Fix the .c linking rule
        selftests: Fix selftests build to just build, not run tests
        selftests, x86, protection_keys: fix wrong offset in siginfo
        selftests, x86, protection_keys: fix uninitialized variable warning
        selftest: cpufreq: Update MAINTAINERS file
        selftest: cpufreq: Add special tests
        selftest: cpufreq: Add support to test cpufreq modules
        selftest: cpufreq: Add suspend/resume/hibernate support
        selftest: cpufreq: Add support for cpufreq tests
        selftests: Add intel_pstate to TARGETS
        selftests/intel_pstate: Update makefile to match new style
        selftests/intel_pstate: Fix warning on loop index overflow
        cpupower: Restore format of frequency-info limit
        selftests/futex: Add headers to makefile dependencies
        selftests/futex: Add stdio used for logging
        selftests: x86 protection_keys remove dead code
        selftests: x86 protection_keys fix unused variable compile warnings
        ...
      c4f3f22e
    • L
      Merge tag 'for-linus-4.11-ofs2' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · cb419553
      Linus Torvalds 提交于
      Pull orangefs updates from Mike Marshall:
       "Orangefs: cleanups, a protocol fix and an added configuration button.
      
        Cleanups:
      
         - silence harmless integer overflow warning (from
           dan.carpenter@oracle.com)
      
         - Dan Carpenter influenced debugfs cleanups.
      
         - remove orangefs_backing_dev_info (from jack@suse.cz)
      
        Protocol fix:
      
         - fix buffer size mis-match between kernel space and user space
      
        New configuration button:
      
         - support readahead_readcnt parameter"
      
      * tag 'for-linus-4.11-ofs2' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        orangefs: fix buffer size mis-match between kernel space and user space.
        orangefs: Dan Carpenter influenced cleanups...
        orangefs: Remove orangefs_backing_dev_info
        orangefs: Support readahead_readcnt parameter.
        orangefs: silence harmless integer overflow warning
      cb419553
    • L
      Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 9003ed1f
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "This has a series of fixes and cleanups that Dave Sterba has been
        collecting.
      
        There is a pretty big variety here, cleaning up internal APIs and
        fixing corner cases"
      
      * 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (124 commits)
        Btrfs: use the correct type when creating cow dio extent
        Btrfs: fix deadlock between dedup on same file and starting writeback
        btrfs: use btrfs_debug instead of pr_debug in transaction abort
        btrfs: btrfs_truncate_free_space_cache always allocates path
        btrfs: free-space-cache, clean up unnecessary root arguments
        btrfs: convert btrfs_inc_block_group_ro to accept fs_info
        btrfs: flush_space always takes fs_info->fs_root
        btrfs: pass fs_info to (more) routines that are only called with extent_root
        btrfs: qgroup: Move half of the qgroup accounting time out of commit trans
        btrfs: remove unused parameter from adjust_slots_upwards
        btrfs: remove unused parameters from __btrfs_write_out_cache
        btrfs: remove unused parameter from cleanup_write_cache_enospc
        btrfs: remove unused parameter from __add_inode_ref
        btrfs: remove unused parameter from clone_copy_inline_extent
        btrfs: remove unused parameters from btrfs_cmp_data
        btrfs: remove unused parameter from __add_inline_refs
        btrfs: remove unused parameters from scrub_setup_wr_ctx
        btrfs: remove unused parameter from create_snapshot
        btrfs: remove unused parameter from init_first_rw_device
        btrfs: remove unused parameter from __btrfs_alloc_chunk
        ...
      9003ed1f
    • L
      Merge tag 'platform-drivers-x86-v4.11-1' of git://git.infradead.org/linux-platform-drivers-x86 · 94eae803
      Linus Torvalds 提交于
      Pull x86 platform driver updates from Darren Hart:
       "Big picture:
      
         - New intel_turbo_max_3 driver, providing max core frequency
           information to the scheduler. Intel PMC APL support, s0ix read API,
           and fixes.
      
         - New Silead touchscreen platform touchscreen descriptions.
           Additional hotkey support for the intel-hid driver.
      
         - New model support for dell-laptop and hp_accel.
      
         - Several cleanups, especially to the fujitsu-laptop and
           intel_mid_powerbtn drivers.
      
        Detail summary:
      
        platorm/x86:
         - silead depends on I2C being built-in
         - add support for devices with Silead touchscreens
         - Support Turbo Boost Max 3.0 for non HWP systems
      
        intel_turbo_max_3:
         - make it explicitly non-modular
      
        dell-laptop:
         - Add Latitude 7480 and others to the DMI whitelist
      
        intel-hid:
         - Support 5 button array
      
        thinkpad_acpi:
         - Call led_classdev_notify_brightness_hw_changed on kbd brightness change
         - Use brightness_set_blocking callback for LEDs
         - Stop setting led_classdev brightness directly
      
        acer-wmi:
         - add another KEY_WLAN keycode
         - Inform firmware that RF Button Driver is active
         - setup accelerometer when machine has appropriate notify event
      
        asus-wireless:
         - Fix indentation
         - Use per-HID HSWC parameters
      
        intel_pmc_ipc:
         - Add APL PMC PCI Id
         - read s0ix residency API
         - Remove unused iTCO_version variable
      
        alienware-wmi:
         - Remove header duplicate
      
        intel_pmc_core:
         - fix out-of-bounds accesses on stack
      
        intel_mid_powerbtn:
         - Use SCU IPC directly
         - Unify IRQ acknowledgment
         - Move comment to where it belongs
         - Unify PBSTATUS access
         - Remove snail address
         - Sort headers alphabetically
         - Join string literals
         - Enable driver for Merrifield
         - Acknowledge interrupts
         - Factor out mfld_ack()
         - Introduce driver data
         - Substitute mfld by mid
         - Convert to use devm_*()
      
        fujitsu-laptop:
         - make hotkey handling functions more similar
         - break up complex loop condition
         - move keycode processing to separate functions
         - decrease indentation in acpi_fujitsu_hotkey_notify()
         - simplify logolamp_get()
         - rework logolamp_set() to properly handle errors
         - set default trigger for radio LED to rfkill-any
      
        dell-smbios:
         - Auto-select as needed
      
        intel_mid_thermal:
         - Fix module autoload
         - Remove duplicated platform device ID
      
        mlx-platform:
         - mlxcpld-hotplug driver style fixes
      
        hp_accel:
         - Add support for HP ZBook 17"
      
      * tag 'platform-drivers-x86-v4.11-1' of git://git.infradead.org/linux-platform-drivers-x86: (45 commits)
        platform/x86: intel_turbo_max_3: make it explicitly non-modular
        platform/x86: dell-laptop: Add Latitude 7480 and others to the DMI whitelist
        platform/x86: intel-hid: Support 5 button array
        platform/x86: thinkpad_acpi: Call led_classdev_notify_brightness_hw_changed on kbd brightness change
        platform/x86: thinkpad_acpi: Use brightness_set_blocking callback for LEDs
        platform/x86: thinkpad_acpi: Stop setting led_classdev brightness directly
        leds: class: Add new optional brightness_hw_changed attribute
        platform/x86: acer-wmi: add another KEY_WLAN keycode
        platform/x86: acer-wmi: Inform firmware that RF Button Driver is active
        platform/x86: asus-wireless: Fix indentation
        platform/x86: asus-wireless: Use per-HID HSWC parameters
        platform/x86: intel_pmc_ipc: Add APL PMC PCI Id
        platform/x86: intel_pmc_ipc: read s0ix residency API
        platform/x86: alienware-wmi: Remove header duplicate
        platform/x86: intel_mid_powerbtn: Use SCU IPC directly
        platform/x86: intel_mid_powerbtn: Unify IRQ acknowledgment
        platform/x86: intel_mid_powerbtn: Move comment to where it belongs
        platform/x86: intel_mid_powerbtn: Unify PBSTATUS access
        platform/x86: intel_pmc_core: fix out-of-bounds accesses on stack
        platform/x86: silead depends on I2C being built-in
        ...
      94eae803
    • L
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 5d8a00ee
      Linus Torvalds 提交于
      Pull clk updates from Stephen Boyd:
       "The usual collection of new drivers, non-critical fixes, and updates
        to existing clk drivers. The bulk of the work is on Allwinner and
        Rockchip SoCs, but there's also an Intel Atom driver in here too.
      
        New Drivers:
         - Tegra BPMP firmware
         - Hisilicon hi3660 SoCs
         - Rockchip rk3328 SoCs
         - Intel Atom PMC
         - STM32F746
         - IDT VersaClock 5P49V5923 and 5P49V5933
         - Marvell mv98dx3236 SoCs
         - Allwinner V3s SoCs
      
        Removed Drivers:
         - Samsung Exynos4415 SoCs
      
        Updates:
         - Migrate ABx500 to OF
         - Qualcomm IPQ4019 CPU clks and general PLL support
         - Qualcomm MSM8974 RPM
         - Rockchip non-critical fixes and clk id additions
         - Samsung Exynos4412 CPUs
         - Socionext UniPhier NAND and eMMC support
         - ZTE zx296718 i2s and other audio clks
         - Renesas CAN and MSIOF clks for R-Car M3-W
         - Renesas resets for R-Car Gen2 and Gen3 and RZ/G1
         - TI CDCE913, CDCE937, and CDCE949 clk generators
         - Marvell Armada ap806 CPU frequencies
         - STM32F4* I2S/SAI support
         - Broadcom BCM2835 DSI support
         - Allwinner sun5i and A80 conversion to new style clk bindings"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (130 commits)
        clk: renesas: mstp: ensure register writes complete
        clk: qcom: Do not drop device node twice
        clk: mvebu: adjust clock handling for the CP110 system controller
        clk: mvebu: Expand mv98dx3236-core-clock support
        clk: zte: add i2s clocks for zx296718
        clk: sunxi-ng: sun9i-a80: Fix wrong pointer passed to PTR_ERR()
        clk: sunxi-ng: select SUNXI_CCU_MULT for sun5i
        clk: sunxi-ng: Check kzalloc() for errors and cleanup error path
        clk: tegra: Add BPMP clock driver
        clk: uniphier: add eMMC clock for LD11 and LD20 SoCs
        clk: uniphier: add NAND clock for all UniPhier SoCs
        ARM: dts: sun9i: Switch to new clock bindings
        clk: sunxi-ng: Add A80 Display Engine CCU
        clk: sunxi-ng: Add A80 USB CCU
        clk: sunxi-ng: Add A80 CCU
        clk: sunxi-ng: Support separately grouped PLL lock status register
        clk: sunxi-ng: mux: Get closest parent rate possible with CLK_SET_RATE_PARENT
        clk: sunxi-ng: mux: honor CLK_SET_RATE_NO_REPARENT flag
        clk: sunxi-ng: mux: Fix determine_rate for mux clocks with pre-dividers
        clk: qcom: SDHCI enablement on Nexus 5X / 6P
        ...
      5d8a00ee
    • L
      Merge branch 'i2c/for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 7067739d
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
       "I2C has for you two new drivers (Tegra BPMP and STM32F4), interrupt
        support for pca954x muxes, and a bunch of driver bugfixes and
        improvements. Nothing really special this cycle.
      
        A few commits have been added to my tree just recently. Those are the
        Tegra BPMP driver and a few straightforward bugfixes or cleanups which
        I prefer to have upstream rather soonish. The rest had proper
        linux-next exposure"
      
      * 'i2c/for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (25 commits)
        i2c: thunderx: Replace pci_enable_msix()
        i2c: exynos5: fix arbitration lost handling
        i2c: exynos5: disable fifo-almost-empty irq signal when necessary
        i2c: at91: ensure state is restored after suspending
        i2c: bcm2835: Avoid possible NULL ptr dereference
        i2c: Add Tegra BPMP I2C proxy driver
        dt-bindings: Add Tegra186 BPMP I2C binding
        misc: eeprom: at24: use device_property_*() functions instead of of_get_property()
        i2c: mux: pca954x: Add interrupt controller support
        dt: bindings: i2c-mux-pca954x: Add documentation for interrupt controller
        i2c: mux: pca954x: Add missing pca9542 definition to chip_desc
        i2c: riic: correctly finish transfers
        i2c: i801: Add support for Intel Gemini Lake
        i2c: mux: pca9541: Export OF device ID table as module aliases
        i2c: mux: pca954x: Export OF device ID table as module aliases
        i2c: mux: mlxcpld: remove unused including <linux/version.h>
        i2c: busses: constify i2c_algorithm structures
        i2c: i2c-mux-gpio: rename i2c-gpio-mux to i2c-mux-gpio
        i2c: sh_mobile: document support for r8a7796 (R-Car M3-W)
        i2c: i2c-cros-ec-tunnel: Reduce logging noise
        ...
      7067739d
    • L
      Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · ac1820fb
      Linus Torvalds 提交于
      Pull rdma DMA mapping updates from Doug Ledford:
       "Drop IB DMA mapping code and use core DMA code instead.
      
        Bart Van Assche noted that the ib DMA mapping code was significantly
        similar enough to the core DMA mapping code that with a few changes it
        was possible to remove the IB DMA mapping code entirely and switch the
        RDMA stack to use the core DMA mapping code.
      
        This resulted in a nice set of cleanups, but touched the entire tree
        and has been kept separate for that reason."
      
      * tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (37 commits)
        IB/rxe, IB/rdmavt: Use dma_virt_ops instead of duplicating it
        IB/core: Remove ib_device.dma_device
        nvme-rdma: Switch from dma_device to dev.parent
        RDS: net: Switch from dma_device to dev.parent
        IB/srpt: Modify a debug statement
        IB/srp: Switch from dma_device to dev.parent
        IB/iser: Switch from dma_device to dev.parent
        IB/IPoIB: Switch from dma_device to dev.parent
        IB/rxe: Switch from dma_device to dev.parent
        IB/vmw_pvrdma: Switch from dma_device to dev.parent
        IB/usnic: Switch from dma_device to dev.parent
        IB/qib: Switch from dma_device to dev.parent
        IB/qedr: Switch from dma_device to dev.parent
        IB/ocrdma: Switch from dma_device to dev.parent
        IB/nes: Remove a superfluous assignment statement
        IB/mthca: Switch from dma_device to dev.parent
        IB/mlx5: Switch from dma_device to dev.parent
        IB/mlx4: Switch from dma_device to dev.parent
        IB/i40iw: Remove a superfluous assignment statement
        IB/hns: Switch from dma_device to dev.parent
        ...
      ac1820fb
    • L
      Merge tag 'fbdev-v4.11' of git://github.com/bzolnier/linux · edccb594
      Linus Torvalds 提交于
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
      
       - fix for font color when console is switched to another fb driver
      
       - deferred probing fixes for simplefb driver
      
       - preparations to add support of an optional GPIO to enable panel for
         ARM CLCD driver
      
       - some improvements for ssd1307fb driver
      
       - cleanups for OMAP fbdev LCD drivers
      
       - misc fixes/cleanups for various fb drivers
      
      * tag 'fbdev-v4.11' of git://github.com/bzolnier/linux: (30 commits)
        video: fbdev: fsl-diu-fb: fix spelling mistake "palette"
        fbdev: ssd1307fb: include linux/gpio/consumer.h
        video: fbdev: fsl-diu-fb: remove impossible condition
        video: fbdev: amifb: remove impossible condition
        fbdev/ssd1307fb: clear screen in probe
        fbdev/ssd1307fb: add support to enable VBAT
        fbdev: ssd1307fb: Make reset gpio devicetree property optional
        fbdev: ssd1307fb: Remove reset-active-low from the DT binding document
        fbdev: ssd1307fb: Start to use gpiod API for reset gpio
        video: fbdev: sh_mobile_lcdcfb: fix error return code in sh_mobile_lcdc_probe()
        video: fbdev: offb: switch to using for_each_node_by_type
        video/console: use setup_timer and mod_timer instead of init_timer
        fbdev: omap/lcd: Make callbacks optional
        fbdev: omap/lcd: Staticize non-exported lcd_panel structs
        fbdev: omap/lcd: Remove no-op driver callbacks
        video/mbx: use simple_open()
        video: fbdev: stifb: handle NULL return value from ioremap_nocache
        video: fbdev: pmagb-b-fb: Remove bad `__init' annotation
        video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
        video: ARM CLCD: use panel device node for getting backlight and mode
        ...
      edccb594
    • J
      treewide: Remove remaining executable attributes from source files · 6e5c8381
      Joe Perches 提交于
      These are the current source files that should not have
      executable attributes set.
      
      [ Normally this would be sent through Andrew Morton's tree
        but his quilt tools don't like permission only patches. ]
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6e5c8381
    • L
      Merge branch 'akpm' (patches from Andrew) · 7b46588f
      Linus Torvalds 提交于
      Merge more updates from Andrew Morton:
      
       - almost all of the rest of MM
      
       - misc bits
      
       - KASAN updates
      
       - procfs
      
       - lib/ updates
      
       - checkpatch updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (124 commits)
        checkpatch: remove false unbalanced braces warning
        checkpatch: notice unbalanced else braces in a patch
        checkpatch: add another old address for the FSF
        checkpatch: update $logFunctions
        checkpatch: warn on logging continuations
        checkpatch: warn on embedded function names
        lib/lz4: remove back-compat wrappers
        fs/pstore: fs/squashfs: change usage of LZ4 to work with new LZ4 version
        crypto: change LZ4 modules to work with new LZ4 module version
        lib/decompress_unlz4: change module to work with new LZ4 module version
        lib: update LZ4 compressor module
        lib/test_sort.c: make it explicitly non-modular
        lib: add CONFIG_TEST_SORT to enable self-test of sort()
        rbtree: use designated initializers
        linux/kernel.h: fix DIV_ROUND_CLOSEST to support negative divisors
        lib/find_bit.c: micro-optimise find_next_*_bit
        lib: add module support to atomic64 tests
        lib: add module support to glob tests
        lib: add module support to crc32 tests
        kernel/ksysfs.c: add __ro_after_init to bin_attribute structure
        ...
      7b46588f
    • T
      mac80211_hwsim: Replace bogus hrtimer clockid · 915f3e3f
      Thomas Gleixner 提交于
      mac80211_hwsim initializes a hrtimer with clockid CLOCK_MONOTONIC_RAW.
      That's not supported.
      
      Use CLOCK_MONOTNIC instead.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      915f3e3f
    • M
  4. 25 2月, 2017 22 次提交