1. 13 Jul, 2017 19 commits
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · ad51271a
      Linus Torvalds authored
      Merge yet more updates from Andrew Morton:
      
      - various misc things
      
      - kexec updates
      
      - sysctl core updates
      
      - scripts/gdb udpates
      
      - checkpoint-restart updates
      
      - ipc updates
      
      - kernel/watchdog updates
      
      - Kees's "rough equivalent to the glibc _FORTIFY_SOURCE=1 feature"
      
      - "stackprotector: ascii armor the stack canary"
      
      - more MM bits
      
      - checkpatch updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits)
        writeback: rework wb_[dec|inc]_stat family of functions
        ARM: samsung: usb-ohci: move inline before return type
        video: fbdev: omap: move inline before return type
        video: fbdev: intelfb: move inline before return type
        USB: serial: safe_serial: move __inline__ before return type
        drivers: tty: serial: move inline before return type
        drivers: s390: move static and inline before return type
        x86/efi: move asmlinkage before return type
        sh: move inline before return type
        MIPS: SMP: move asmlinkage before return type
        m68k: coldfire: move inline before return type
        ia64: sn: pci: move inline before type
        ia64: move inline before return type
        FRV: tlbflush: move asmlinkage before return type
        CRIS: gpio: move inline before return type
        ARM: HP Jornada 7XX: move inline before return type
        ARM: KVM: move asmlinkage before type
        checkpatch: improve the STORAGE_CLASS test
        mm, migration: do not trigger OOM killer when migrating memory
        drm/i915: use __GFP_RETRY_MAYFAIL
        ...
      ad51271a
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform-drivers-x86 · 6735a197
      Linus Torvalds authored
      Pull more x86 platform driver updates from Darren Hart:
       "Add new platform matches for silead_dmi and ideapad-laptop. Several
        constify patches for attribute_group structures. Fixes for peaq-wmi
        and intel_telemetry.
      
        silead_dmi:
         - Add entry for Ployer Momo7w tablet touchscreen
         - Add touchscreen info for I.T.Works TW891 2-in-1
      
        toshiba_acpi:
         - constify attribute_group structures.
      
        asus-wmi:
         - constify attribute_group structures.
      
        panasonic-laptop:
         - constify attribute_group structures.
      
        alienware-wmi:
         - constify attribute_group structures.
      
        samsung-laptop:
         - constify attribute_group structures.
      
        compal-laptop:
         - constify attribute_group structures.
      
        fujitsu-laptop:
         - constify attribute_group structures.
         - add NULL check on devm_kzalloc() return value
      
        peaq-wmi:
         - Fix peaq_ignore_events_counter handling off by 1
      
        ideapad-laptop:
         - Fix indentation in DMI table
         - Add several models to no_hw_rfkill
         - Add IdeaPad V510-15IKB to no_hw_rfkill
      
        intel_telemetry:
         - Add debugfs entry for S0ix residency
      
        intel_telemetry_debugfs:
         - fix some error codes in init
         - fix oops when load/unload module"
      
      * tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform-drivers-x86:
        platform/x86: silead_dmi: Add entry for Ployer Momo7w tablet touchscreen
        platform/x86: toshiba_acpi: constify attribute_group structures.
        platform/x86: asus-wmi: constify attribute_group structures.
        platform/x86: panasonic-laptop: constify attribute_group structures.
        platform/x86: alienware-wmi: constify attribute_group structures.
        platform/x86: samsung-laptop: constify attribute_group structures.
        platform/x86: compal-laptop: constify attribute_group structures.
        platform/x86: fujitsu-laptop: constify attribute_group structures.
        platform/x86: peaq-wmi: Fix peaq_ignore_events_counter handling off by 1
        platform/x86: fujitsu-laptop: add NULL check on devm_kzalloc() return value
        platform/x86: silead_dmi: Add touchscreen info for I.T.Works TW891 2-in-1
        platform/x86: ideapad-laptop: Fix indentation in DMI table
        platform/x86: ideapad-laptop: Add several models to no_hw_rfkill
        platform/x86: ideapad-laptop: Add IdeaPad V510-15IKB to no_hw_rfkill
        platform/x86: intel_telemetry: Add debugfs entry for S0ix residency
        platform/x86: intel_telemetry_debugfs: fix some error codes in init
        platform/x86: intel_telemetry_debugfs: fix oops when load/unload module
      6735a197
    • Linus Torvalds's avatar
      Merge tag 'vfio-v4.13-rc1' of git://github.com/awilliam/linux-vfio · 8c6f5e73
      Linus Torvalds authored
      Pull VFIO updates from Alex Williamson:
      
       - Include Intel XXV710 in INTx workaround (Alex Williamson)
      
       - Make use of ERR_CAST() for error return (Dan Carpenter)
      
       - Fix vfio_group release deadlock from iommu notifier (Alex Williamson)
      
       - Unset KVM-VFIO attributes only on group match (Alex Williamson)
      
       - Fix release path group/file matching with KVM-VFIO (Alex Williamson)
      
       - Remove unnecessary lock uses triggering lockdep splat (Alex Williamson)
      
      * tag 'vfio-v4.13-rc1' of git://github.com/awilliam/linux-vfio:
        vfio: Remove unnecessary uses of vfio_container.group_lock
        vfio: New external user group/file match
        kvm-vfio: Decouple only when we match a group
        vfio: Fix group release deadlock
        vfio: Use ERR_CAST() instead of open coding it
        vfio/pci: Add Intel XXV710 to hidden INTx devices
      8c6f5e73
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 3a00be19
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "Here is the pull-request for the RTC subsystem for 4.13.
      
        Subsystem:
      
         - expose non volatile RAM using nvmem instead of open coding in many
           drivers. Unfortunately, this option has to be enabled by default to
           not break existing users.
      
         - rtctest can now test for cutoff dates, showing when an RTC will
           start failing to properly save time and date.
      
         - new RTC registration functions to remove race conditions in drivers
      
        Newly supported RTCs:
      
         - Broadcom STB wake-timer
      
         - Epson RX8130CE
      
         - Maxim IC DS1308
      
         - STMicroelectronics STM32H7
      
        Drivers:
      
         - ds1307: use regmap, use nvmem, more cleanups
      
         - ds3232: temperature reading support
      
         - gemini: renamed to ftrtc010
      
         - m41t80: use CCF to expose the clock
      
         - rv8803: use nvmem
      
         - s3c: many cleanups
      
         - st-lpc: fix y2106 bug"
      
      * tag 'rtc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (51 commits)
        rtc: Remove wrong deprecation comment
        nvmem: include linux/err.h from header
        rtc: st-lpc: make it robust against y2038/2106 bug
        rtc: rtctest: add check for problematic dates
        tools: timer: add rtctest_setdate
        rtc: ds1307: remove ds1307_remove
        rtc: ds1307: use generic nvmem
        rtc: ds1307: switch to rtc_register_device
        rtc: rv8803: remove rv8803_remove
        rtc: rv8803: use generic nvmem support
        rtc: rv8803: switch to rtc_register_device
        rtc: add generic nvmem support
        rtc: at91rm9200: remove race condition
        rtc: introduce new registration method
        rtc: class separate id allocation from registration
        rtc: class separate device allocation from registration
        rtc: stm32: add STM32H7 RTC support
        dt-bindings: rtc: stm32: add support for STM32H7
        rtc: ds1307: add ds1308 variant
        rtc: ds3232: add temperature support
        ...
      3a00be19
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20170713' of git://git.infradead.org/linux-mtd · b5e16170
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "General updates:
         - Cleanups and additional flash support for "dataflash" driver
         - new driver for mchp23k256 SPI SRAM device
         - improve handling of MTDs without eraseblocks (i.e., MTD_NO_ERASE)
         - refactor and improve "sub-partition" handling with TRX partition
           parser; partitions can now be created as sub-partitions of another
           partition
      
        SPINOR updates, from Cyrille Pitchen and Marek Vasut:
         - introduce support to the SPI 1-2-2 and 1-4-4 protocols.
         - introduce support to the Double Data Rate (DDR) mode.
         - introduce support to the Octo SPI protocols.
         - add support to new memory parts for Spansion, Macronix and Winbond.
         - add fixes for the Aspeed, STM32 and Cadence QSPI controler drivers.
         - clean up the st_spi_fsm driver.
      
        NAND updates, from Boris Brezillon:
         - addition of on-die ECC support to Micron driver
         - addition of helpers to help drivers choose most appropriate ECC
           settings
         - deletion of dead-code (cached programming and ->errstat() hook)
         - make sure drivers that do not support the SET/GET FEATURES command
           return ENOTSUPP use a dummy ->set/get_features implementation
           returning -ENOTSUPP (required for Micron on-die ECC)
         - change the semantic of ecc->write_page() for drivers setting the
           NAND_ECC_CUSTOM_PAGE_ACCESS flag
         - support exiting 'GET STATUS' command in default ->cmdfunc()
           implementations
         - change the prototype of ->setup_data_interface()
      
        A bunch of driver related changes:
         - various cleanup, fixes and improvements of the MTK driver
         - OMAP DT bindings fixes
         - support for ->setup_data_interface() in the fsmc driver
         - support for imx7 in the gpmi driver
         - finalization of the denali driver rework (thanks to Masahiro for
           the work he's done on this driver)
         - fix "bitflips in erased pages" handling in the ifc driver
         - addition of PM ops and dynamic timing configuration to the atmel
           driver"
      
      * tag 'for-linus-20170713' of git://git.infradead.org/linux-mtd: (118 commits)
        Documentation: ABI: mtd: describe "offset" more precisely
        mtd: Fix check in mtd_unpoint()
        mtd: nand: mtk: release lock on error path
        mtd: st_spi_fsm: remove SPINOR_OP_RDSR2 and use SPINOR_OP_RDCR instead
        mtd: spi-nor: cqspi: remove duplicate const
        mtd: spi-nor: Add support for Spansion S25FL064L
        mtd: spi-nor: Add support for mx66u51235f
        mtd: nand: mtk: add ->setup_data_interface() hook
        mtd: nand: mtk: remove unneeded mtk_ecc_hw_init from mtk_ecc_resume
        mtd: nand: mtk: remove unneeded mtk_nfc_hw_init from mtk_nfc_resume
        mtd: nand: mtk: disable ecc irq when writing page with hwecc
        mtd: nand: mtk: fix incorrect register setting order about ecc irq
        mtd: partitions: fixup some allocate_partition() whitespace
        mtd: parsers: trx: fix pr_err format for printing offset
        MAINTAINERS: Update SPI NOR subsystem git repositories
        mtd: extract TRX parser out of bcm47xxpart into a separated module
        mtd: partitions: add support for partition parsers
        mtd: partitions: add support for subpartitions
        mtd: partitions: rename "master" to the "parent" where appropriate
        mtd: partitions: remove sysfs files when deleting all master's partitions
        ...
      b5e16170
    • Linus Torvalds's avatar
      Merge tag 'fbdev-v4.13' of git://github.com/bzolnier/linux · da16dd97
      Linus Torvalds authored
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here, just a couple of small bugfixes,
        improvements and cleanups.
      
         - fix get_fb_unmapped_area() helper handling (Benjamin Gaignard)
      
         - check return value of clk_prepare_enable() in pxafb driver (Arvind
           Yadav)
      
         - fix error path handling in vmlfb driver (Alexey Khoroshilov)
      
         - printks fixes/cleanups for uvesafb driver (Joe Perches)
      
         - fix unusued variable warning in atyfb driver (Arnd Bergmann)
      
         - constifications for sh_mobile_lcdcfb, fsl-diu-fb, omapfb (Arvind
           Yadav)
      
         - mdacon driver cleanups (Jiri Slaby)
      
         - misc cleanups (Andy Shevchenko, Karim Eshapa, Gustavo A. R. Silva,
           Dan Carpenter)"
      
      * tag 'fbdev-v4.13' of git://github.com/bzolnier/linux:
        fbdev: make get_fb_unmapped_area depends of !MMU
        atyfb: hide unused variable
        video: fbdev: matrox: the list iterator can't be NULL
        video: fbdev: aty: remove useless variable assignments in aty_var_to_crtc()
        fbdev: omapfb: constify ctrl_caps, color_caps, panel_attr_grp and ctrl_attr_grp
        omapfb: panel-dsi-cm: constify dsicm_attr_group
        vmlfb: Fix error handling in cr_pll_init()
        video: fbdev: fsl-diu-fb: constify mfb_template and fsl_diu_match.
        uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening
        video: fbdev: sh_mobile_lcdcfb: constify sh_mobile_lcdc_bl_ops.
        omapfb: Use sysfs_match_string() helper
        video: fbdev: pxafb: Handle return value of clk_prepare_enable
        video: fbdev: omap2: omapfb: displays: panel-dsi-cm: Use time comparison kernel macro.
        mdacon: replace MDA_ADDR macro by inline function
        mdacon: make mda_vram_base u16 *
        mdacon: align code in mda_detect properly
      da16dd97
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.13-rc1' of... · 38f7d2da
      Linus Torvalds authored
      Merge tag 'pwm/for-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This release cycle's changes include mostly updates and cleanups to
        existing drivers along with a few cleanups to the core, documentation
        and device tree bindings"
      
      * tag 'pwm/for-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: cros-ec: Fix transposed param settings
        pwm: meson: Improve PWM calculation precision
        dt-bindings: pwm: meson: Add compatible for gxbb ao PWMs
        pwm: meson: Add compatible for the gxbb ao PWMs
        pwm: sun4i: Drop legacy callbacks
        pwm: sun4i: Switch to atomic PWM
        pwm: sun4i: Improve hardware read out
        pwm: hibvt: Constify hibvt_pwm_ops
        pwm: Silently error out on EPROBE_DEFER
        pwm: Standardize document format
        pwm: bfin: Remove unneeded error message
        dt-bindings: pwm: Update STM32 timers clock names
        dt-bindings: pwm: Add R-Car M3-W device tree bindings
        pwm: tegra: Set maximum pwm clock source per SoC tapeout
      38f7d2da
    • Linus Torvalds's avatar
      Merge tag 'for-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · dc087d1e
      Linus Torvalds authored
      Pull power supply fixes from  Reichel:
       "I have two more fixes for the power-supply subsystem:
      
         - two fixes for twl4030-charger"
      
      * tag 'for-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        power: supply: twl4030-charger: add deferred probing for phy and iio
        power: supply: twl4030-charger: move irq allocation to just before irqs are enabled
      dc087d1e
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.13-rc1' of git://people.freedesktop.org/~airlied/linux · 311ac00d
      Linus Torvalds authored
      Pull more drm updates from Dave Airlie:
       "i915, amd and some core fixes + mediatek color support.
      
        Some fixes tree came in since the main pull request for rc1, primarily
        i915 and drm-misc and one amd fix. The drm core vblank regression fix
        is probably the most important thing.
      
        I've also added the mediatek feature pull, it wasn't that big and
        didn't look like it would have any impact outside of mediatek, in fact
        it looks to just be a single feature, and some cleanups"
      
      * tag 'drm-fixes-for-v4.13-rc1' of git://people.freedesktop.org/~airlied/linux: (31 commits)
        drm/i915: Make DP-MST connector info work
        drm/i915/gvt: Use fence error from GVT request for workload status
        drm/i915/gvt: remove scheduler_mutex in per-engine workload_thread
        drm/i915/gvt: Revert "drm/i915/gvt: Fix possible recursive locking issue"
        drm/i915/gvt: Audit the command buffer address
        drm/i915/gvt: Fix a memory leak in intel_gvt_init_gtt()
        drm/rockchip: fix NULL check on devm_kzalloc() return value
        drm/i915/fbdev: Check for existence of ifbdev->vma before operations
        drm/radeon: Fix eDP for single-display iMac10,1 (v2)
        drm/i915: Hold RPM wakelock while initializing OA buffer
        drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming
        drm/i915/cfl: Fix Workarounds.
        drm/i915: Avoid undefined behaviour of "u32 >> 32"
        drm/i915: reintroduce VLV/CHV PFI programming power domain workaround
        drm/i915: Fix an error checking test
        drm/i915: Disable MSI for all pre-gen5
        drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
        drm: vblank: Fix vblank timestamp update
        drm/i915/gvt: Make function dpy_reg_mmio_readx safe
        drm/mediatek: separate color module to fixup error memory reallocation
        ...
      311ac00d
    • Jeffy Chen's avatar
      drm: Add missing field copy in compat_drm_version · 266530b3
      Jeffy Chen authored
      DRM_IOCTL_VERSION is supposed to update the name_len/date_len/desc_len
      fields to user.
      
      Fixes: 012c6741 ("switch compat_drm_version() to drm_ioctl_kernel()")
      Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      266530b3
    • Rafał Miłecki's avatar
      Documentation: ABI: mtd: describe "offset" more precisely · 7d84120b
      Rafał Miłecki authored
      So far Linux supported only two levels of MTD devices so we didn't need
      a very precise description for this sysfs file. With commit
      97519dc5 ("mtd: partitions: add support for subpartitions") there
      is support for a tree structure so we should have more precise
      description. Using "parent" and "flash device" makes it more accurate.
      Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
      Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
      7d84120b
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-next · 6419ec78
      Dave Airlie authored
      single r700 fix.
      * 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: Fix eDP for single-display iMac10,1 (v2)
      6419ec78
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 4ca6df13
      Linus Torvalds authored
      Pull sysctl fix from Eric Biederman:
       "A rather embarassing and hard to hit bug was merged into 4.11-rc1.
      
        Andrei Vagin tracked this bug now and after some staring at the code
        I came up with a fix"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        proc: Fix proc_sys_prune_dcache to hold a sb reference
      4ca6df13
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · edaf3825
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
      1) Fix 64-bit division in mlx5 IPSEC offload support, from Ilan Tayari
         and Arnd Bergmann.
      
      2) Fix race in statistics gathering in bnxt_en driver, from Michael
         Chan.
      
      3) Can't use a mutex in RCU reader protected section on tap driver, from
         Cong WANG.
      
      4) Fix mdb leak in bridging code, from Eduardo Valentin.
      
      5) Fix free of wrong pointer variable in nfp driver, from Dan Carpenter.
      
      6) Buffer overflow in brcmfmac driver, from Arend van SPriel.
      
      7) ioremap_nocache() return value needs to be checked in smsc911x
         driver, from Alexey Khoroshilov.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
        net: stmmac: revert "support future possible different internal phy mode"
        sfc: don't read beyond unicast address list
        datagram: fix kernel-doc comments
        socket: add documentation for missing elements
        smsc911x: Add check for ioremap_nocache() return code
        brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
        net: hns: Bugfix for Tx timeout handling in hns driver
        net: ipmr: ipmr_get_table() returns NULL
        nfp: freeing the wrong variable
        mlxsw: spectrum_switchdev: Check status of memory allocation
        mlxsw: spectrum_switchdev: Remove unused variable
        mlxsw: spectrum_router: Fix use-after-free in route replace
        mlxsw: spectrum_router: Add missing rollback
        samples/bpf: fix a build issue
        bridge: mdb: fix leak on complete_info ptr on fail path
        tap: convert a mutex to a spinlock
        cxgb4: fix BUG() on interrupt deallocating path of ULD
        qed: Fix printk option passed when printing ipv6 addresses
        net: Fix minor code bug in timestamping.txt
        net: stmmac: Make 'alloc_dma_[rt]x_desc_resources()' look even closer
        ...
      edaf3825
    • Linus Torvalds's avatar
      disable new gcc-7.1.1 warnings for now · bd664f6b
      Linus Torvalds authored
      I made the mistake of upgrading my desktop to the new Fedora 26 that
      comes with gcc-7.1.1.
      
      There's nothing wrong per se that I've noticed, but I now have 1500
      lines of warnings, mostly from the new format-truncation warning
      triggering all over the tree.
      
      We use 'snprintf()' and friends in a lot of places, and often know that
      the numbers are fairly small (ie a controller index or similar), but gcc
      doesn't know that, and sees an 'int', and thinks that it could be some
      huge number.  And then complains when our buffers are not able to fit
      the name for the ten millionth controller.
      
      These warnings aren't necessarily bad per se, and we probably want to
      look through them subsystem by subsystem, but at least during the merge
      window they just mean that I can't even see if somebody is introducing
      any *real* problems when I pull.
      
      So warnings disabled for now.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bd664f6b
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-fixes-2017-07-10' of... · 0355e22a
      Dave Airlie authored
      Merge tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm-misc into drm-next
      
      Core Changes:
      - Fix empty timestamps on hw without vlbank counter (Laurent)
      - Clear atomic state before retrying ww/mutex acquisition in remove_fb (Maarten)
      
      Driver Changes:
      - rockchip: Fix incorrect NULL pointer check after allocation (Gustavo)
      
      Cc: Gustavo A. R. Silva <garsilva@embeddedor.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
      
      * tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm-misc:
        drm/rockchip: fix NULL check on devm_kzalloc() return value
        drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
        drm: vblank: Fix vblank timestamp update
        DRM: Fix an incorrectly formatted table
        bridge: Fix panel-bridge error return on !panel.
        drm/rockchip: gem: add the lacks lock and trivial changes
      0355e22a
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2017-07-11' of... · caa164e3
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2017-07-11' of git://anongit.freedesktop.org/git/drm-intel into drm-next
      
      drm/i915 fixes for v4.13-rc1
      
      * tag 'drm-intel-next-fixes-2017-07-11' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915: Make DP-MST connector info work
        drm/i915/gvt: Use fence error from GVT request for workload status
        drm/i915/gvt: remove scheduler_mutex in per-engine workload_thread
        drm/i915/gvt: Revert "drm/i915/gvt: Fix possible recursive locking issue"
        drm/i915/gvt: Audit the command buffer address
        drm/i915/gvt: Fix a memory leak in intel_gvt_init_gtt()
        drm/i915/fbdev: Check for existence of ifbdev->vma before operations
        drm/i915: Hold RPM wakelock while initializing OA buffer
        drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming
        drm/i915/cfl: Fix Workarounds.
        drm/i915: Avoid undefined behaviour of "u32 >> 32"
        drm/i915: reintroduce VLV/CHV PFI programming power domain workaround
        drm/i915: Fix an error checking test
        drm/i915: Disable MSI for all pre-gen5
        drm/i915/gvt: Make function dpy_reg_mmio_readx safe
        drm/i915/gvt: Don't read ADPA_CRT_HOTPLUG_MONITOR from host
        drm/i915/gvt: Set initial PORT_CLK_SEL vreg for BDW
        drm/i915/gvt: Fix inconsistent locks holding sequence
        drm/i915/gvt: Fix possible recursive locking issue
      caa164e3
    • Dave Airlie's avatar
      Merge branch 'mediatek-drm-next-4.13' of... · 39bf0bff
      Dave Airlie authored
      Merge branch 'mediatek-drm-next-4.13' of https://github.com/ckhu-mediatek/linux.git-tags into drm-next
      
      This include new color format support and some fixups.
      
      * 'mediatek-drm-next-4.13' of https://github.com/ckhu-mediatek/linux.git-tags:
        drm/mediatek: separate color module to fixup error memory reallocation
        drm/mediatek: check for memory allocation failure
        drm/mediatek: re-phrase DRM_INFO error message
        drm/mediatek: use platform_register_drivers
        drm/mediatek: Support UYVY and YUYV format for overlay
      39bf0bff
    • Linus Torvalds's avatar
      Merge tag 'modules-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · 3a75ad14
      Linus Torvalds authored
      Pull modules updates from Jessica Yu:
       "Summary of modules changes for the 4.13 merge window:
      
         - Minor code cleanups
      
         - Avoid accessing mod struct prior to checking module struct version,
           from Kees
      
         - Fix racy atomic inc/dec logic of kmod_concurrent_max in kmod, from
           Luis"
      
      * tag 'modules-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        module: make the modinfo name const
        kmod: reduce atomic operations on kmod_concurrent and simplify
        module: use list_for_each_entry_rcu() on find_module_all()
        kernel/module.c: suppress warning about unused nowarn variable
        module: Add module name to modinfo
        module: Pass struct load_info into symbol checks
      3a75ad14
  2. 12 Jul, 2017 21 commits