1. 16 May, 2019 27 commits
    • Linus Torvalds's avatar
      Merge tag 'media/v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 01be377c
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "Some fixes for some platform drivers (rockchip, atmel, omap, daVinci,
        tegra-cec, coda and rcar).
      
        Also includes a fix on one of the V4L2 uAPI doc, explaining a border
        case"
      
      * tag 'media/v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        media: rockchip/vpu: Fix/re-order probe-error/remove path
        media: rockchip/vpu: Initialize mdev->bus_info
        media: rockchip/vpu: Get vdev from the file arg in vidioc_querycap()
        media: rockchip/vpu: Add missing dont_use_autosuspend() calls
        media: rockchip/vpu: Do not request id 0 for our video device
        media: tegra-cec: fix cec_notifier_parse_hdmi_phandle return check
        media: davinci/vpbe: array underflow in vpbe_enum_outputs()
        media: field-order.rst: clarify FIELD_ANY and FIELD_NONE
        media: staging/imx: add media device to capture register
        media: rcar-csi2: Propagate the FLD signal for NTSC and PAL
        media: rcar-csi2: restart CSI-2 link if error is detected
        media: omap_vout: potential buffer overflow in vidioc_dqbuf()
        media: coda: fix unset field and fail on invalid field in buf_prepare
        media: atmel: atmel-isc: fix asd memory allocation
        media: atmel: atmel-isc: fix INIT_WORK misplacement
        media: atmel: atmel-isc: limit incoming pixels per frame
      01be377c
    • Linus Torvalds's avatar
      Merge tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 11b11773
      Linus Torvalds authored
      Pull EDAC fixes from Borislav Petkov:
      
       - Do not build mpc85_edac as a module (Michael Ellerman)
      
       - Correct edac_mc_find()'s return value on error (Robert Richter)
      
      * tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC/mc: Fix edac_mc_find() in case no device is found
        EDAC/mpc85xx: Prevent building as a module
      11b11773
    • Linus Torvalds's avatar
      Merge tag 'configfs-for-5.2' of git://git.infradead.org/users/hch/configfs · 4e785e8d
      Linus Torvalds authored
      Pull configfs update from Christoph Hellwig:
      
       - a fix for an error path use after free (YueHaibing)
      
      * tag 'configfs-for-5.2' of git://git.infradead.org/users/hch/configfs:
        configfs: fix possible use-after-free in configfs_register_group
      4e785e8d
    • Linus Torvalds's avatar
      Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · 27ebbf9d
      Linus Torvalds authored
      Pull nommu generic uaccess updates from Arnd Bergmann:
       "asm-generic: kill <asm/segment.h> and improve nommu generic uaccess helpers
      
        Christoph Hellwig writes:
      
           This is a series doing two somewhat interwinded things. It improves
           the asm-generic nommu uaccess helper to optionally be entirely
           generic and not require any arch helpers for the actual uaccess.
           For the generic uaccess.h to actually be generically useful I also
           had to kill off the mess we made of <asm/segment.h>, which really
           shouldn't exist on most architectures"
      
      * tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        asm-generic: optimize generic uaccess for 8-byte loads and stores
        asm-generic: provide entirely generic nommu uaccess
        arch: mostly remove <asm/segment.h>
        asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>
      27ebbf9d
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d396360a
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Misc fixes and updates:
      
         - a handful of MDS documentation/comment updates
      
         - a cleanup related to hweight interfaces
      
         - a SEV guest fix for large pages
      
         - a kprobes LTO fix
      
         - and a final cleanup commit for vDSO HPET support removal"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/speculation/mds: Improve CPU buffer clear documentation
        x86/speculation/mds: Revert CPU buffer clear on double fault exit
        x86/kconfig: Disable CONFIG_GENERIC_HWEIGHT and remove __HAVE_ARCH_SW_HWEIGHT
        x86/mm: Do not use set_{pud, pmd}_safe() when splitting a large page
        x86/kprobes: Make trampoline_handler() global and visible
        x86/vdso: Remove hpet_page from vDSO
      d396360a
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b2c3dda6
      Linus Torvalds authored
      Pull time fixes from Ingo Molnar:
       "A TIA adjtimex interface extension, and a POSIX compliance ABI fix for
        timespec64 users"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ntp: Allow TAI-UTC offset to be set to zero
        y2038: Make CONFIG_64BIT_TIME unconditional
      b2c3dda6
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c77ee64f
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "An x86 PMU constraint fix, an interface fix, and a Sparse fix"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel: Allow PEBS multi-entry in watermark mode
        perf/x86/intel: Fix INTEL_FLAGS_EVENT_CONSTRAINT* masking
        perf/x86/amd/iommu: Make the 'amd_iommu_attr_groups' symbol static
      c77ee64f
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f57d7715
      Linus Torvalds authored
      Pull locking fix from Ingo Molnar:
       "A single rwsem fix"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/rwsem: Prevent decrement of reader count before increment
      f57d7715
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b2ca74d3
      Linus Torvalds authored
      Pull core fixes from Ingo Molnar:
       "A handful of objtool updates, plus a documentation addition for
        __ab_c_size()"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Fix whitelist documentation typo
        objtool: Fix function fallthrough detection
        objtool: Don't use ignore flag for fake jumps
        overflow.h: Add comment documenting __ab_c_size()
      b2ca74d3
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 8c05f3b9
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "ARM development updates:
      
         - more unified assembly conversions for clang
      
         - drop obsolete -mauto-it assembler option
      
         - remove arm_memory_present in preference to the generic version
      
         - remove unused asm/limits.h header
      
         - vdso linker update
      
        We tried to make the assembler warn if unified syntax was not used,
        but unfortunately older versions of GCC warn, so the commit had to be
        reverted"
      
      * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
        Revert "ARM: 8846/1: warn if divided syntax assembler is used"
        ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO
        ARM: 8855/1: remove unused <asm/limits.h>
        ARM: 8850/1: use memblocks_present
        ARM: 8854/1: drop -mauto-it
        ARM: 8846/1: warn if divided syntax assembler is used
        ARM: 8853/1: drop WASM to work around LLVM issue
        ARM: 8852/1: uaccess: use unified assembler language syntax
        ARM: 8851/1: add TUSERCOND() macro for conditional postfix
      8c05f3b9
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · ab02888e
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "Mostly the usual churn due to options being reordered or not added in
        the right locations.
      
        Some various enabling of new drivers, etc.
      
        ... i.e. the usual updates, nothing particularly sticks out"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits)
        arm64: defconfig: Update UFSHCD for Hi3660 soc
        ARM: multi_v7_defconfig: Enable support for STPMIC1
        ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks
        arm64: defconfig: enable mv-xor driver
        ARM: Enable Trusted Foundations for multiplatform ARM v7
        ARM: tegra: Enable Trusted Foundations by default
        ARM: tegra: Update default configuration for v5.1-rc1
        ARM: multi_v7_defconfig: Update for moved options
        ARM: multi_v7_defconfig: Update for dropped options
        ARM: shmobile: Enable USB [EO]HCI HCD PLATFORM support in shmobile_defconfig
        ARM: shmobile: Enable PHY_RCAR_GEN3_USB2 in shmobile_defconfig
        ARM: qcom_defconfig: add options for LG Nexus 5 phone
        arm64: defconfig: include the Agilex platform to the arm64 defconfig
        arm64: defconfig: Add PWM Fan support
        arm64: defconfig: Enable Tegra HDA support
        ARM: multi_v7_defconfig: Enable support for CFI NOR FLASH
        ARM: shmobile: defconfig: Enable support for CFI NOR FLASH
        ARM: shmobile: defconfig: Refresh for v5.1-rc1
        ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers
        arm64: defconfig: enable fpga and service layer
        ...
      ab02888e
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · dc413a90
      Linus Torvalds authored
      Pull ARM SoC-related driver updates from Olof Johansson:
       "Various driver updates for platforms and a couple of the small driver
        subsystems we merge through our tree:
      
        Among the larger pieces:
      
         - Power management improvements for TI am335x and am437x (RTC
           suspend/wake)
      
         - Misc new additions for Amlogic (socinfo updates)
      
         - ZynqMP FPGA manager
      
         - Nvidia improvements for reset/powergate handling
      
         - PMIC wrapper for Mediatek MT8516
      
         - Misc fixes/improvements for ARM SCMI, TEE, NXP i.MX SCU drivers"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (57 commits)
        soc: aspeed: fix Kconfig
        soc: add aspeed folder and misc drivers
        spi: zynqmp: Fix build break
        soc: imx: Add generic i.MX8 SoC driver
        MAINTAINERS: Update email for Qualcomm SoC maintainer
        memory: tegra: Fix a typos for "fdcdwr2" mc client
        Revert "ARM: tegra: Restore memory arbitration on resume from LP1 on Tegra30+"
        memory: tegra: Replace readl-writel with mc_readl-mc_writel
        memory: tegra: Fix integer overflow on tick value calculation
        memory: tegra: Fix missed registers values latching
        ARM: tegra: cpuidle: Handle tick broadcasting within cpuidle core on Tegra20/30
        optee: allow to work without static shared memory
        soc/tegra: pmc: Move powergate initialisation to probe
        soc/tegra: pmc: Remove reset sysfs entries on error
        soc/tegra: pmc: Fix reset sources and levels
        soc: amlogic: meson-gx-pwrc-vpu: Add support for G12A
        soc: amlogic: meson-gx-pwrc-vpu: Fix power on/off register bitmask
        fpga manager: Adding FPGA Manager support for Xilinx zynqmp
        dt-bindings: fpga: Add bindings for ZynqMP fpga driver
        firmware: xilinx: Add fpga API's
        ...
      dc413a90
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · e8a1d701
      Linus Torvalds authored
      Pull ARM Device-tree updates from Olof Johansson:
       "Besides new bindings and additional descriptions of hardware blocks
        for various SoCs and boards, the main new contents here is:
      
        SoCs:
         - Intel Agilex (SoCFPGA)
         - NXP i.MX8MM (Quad Cortex-A53 with media/graphics focus)
      
        New boards:
         - Allwinner:
            + RerVision H3-DVK (H3)
            + Oceanic 5205 5inMFD (H6)
            + Beelink GS2 (H6)
            + Orange Pi 3 (H6)
         - Rockchip:
            + Orange Pi RK3399
            + Nanopi NEO4
            + Veyron-Mighty Chromebook variant
         - Amlogic:
            + SEI Robotics SEI510
         - ST Micro:
            + stm32mp157a discovery1
            + stm32mp157c discovery2
         - NXP:
            + Eckelmann ci4x10 (i.MX6DL)
            + i.MX8MM EVK (i.MX8MM)
            + ZII i.MX7 RPU2 (i.MX7)
            + ZII SPB4 (VF610)
            + Zii Ultra (i.MX8M)
            + TQ TQMa7S (i.MX7Solo)
            + TQ TQMa7D (i.MX7Dual)
            + Kobo Aura (i.MX50)
            + Menlosystems M53 (i.MX53)j
         - Nvidia:
            + Jetson Nano (Tegra T210)"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (593 commits)
        arm64: dts: bitmain: Add UART pinctrl support for Sophon Edge
        arm64: dts: bitmain: Add pinctrl support for BM1880 SoC
        arm64: dts: bitmain: Add GPIO Line names for Sophon Edge board
        arm64: dts: bitmain: Add GPIO support for BM1880 SoC
        ARM: dts: gemini: Indent DIR-685 partition table
        dt-bindings: hwmon (pwm-fan) Remove dead "cooling-*-state" properties
        ARM: dts: qcom-apq8064: Set 'cxo_board' as ref clock of the DSI PHY
        arm64: dts: msm8998: thermal: Restrict thermal zone name length to under 20
        arm64: dts: msm8998: thermal: Fix number of supported sensors
        arm64: dts: msm8998-mtp: thermal: Remove skin and battery thermal zones
        arm64: dts: exynos: Move fixed-clocks out of soc
        arm64: dts: exynos: Move pmu and timer nodes out of soc
        ARM: dts: s5pv210: Fix camera clock provider on Goni board
        ARM: dts: exynos: Properly override node to use MDMA0 on Universal C210
        ARM: dts: exynos: Move fixed-clocks out of soc on Exynos3250
        ARM: dts: exynos: Remove unneeded address/size cells from fixed-clock on Exynos3250
        ARM: dts: exynos: Move pmu and timer nodes out of soc
        arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
        arm64: dts: db820c: Add sound card support
        arm64: dts: apq8096-db820c: Add HDMI display support
        ...
      e8a1d701
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 22c58fd7
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "SoC updates, mostly refactorings and cleanups of old legacy platforms.
      
        Major themes this release:
      
         - Conversion of ixp4xx to a modern platform (drivers, DT, bindings)
      
         - Moving some of the ep93xx headers around to get it closer to
           multiplatform enabled.
      
         - Cleanups of Davinci
      
        This also contains a few patches that were queued up as fixes before
        5.1 but I didn't get sent in before release"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (123 commits)
        ARM: debug-ll: add default address for digicolor
        ARM: u300: regulator: add MODULE_LICENSE()
        ARM: ep93xx: move private headers out of mach/*
        ARM: ep93xx: move pinctrl interfaces into include/linux/soc
        ARM: ep93xx: keypad: stop using mach/platform.h
        ARM: ep93xx: move network platform data to separate header
        ARM: stm32: add AMBA support for stm32 family
        MAINTAINERS: update arch/arm/mach-davinci
        ARM: rockchip: add missing of_node_put in rockchip_smp_prepare_pmu
        ARM: dts: Add queue manager and NPE to the IXP4xx DTSI
        soc: ixp4xx: qmgr: Add DT probe code
        soc: ixp4xx: qmgr: Add DT bindings for IXP4xx qmgr
        soc: ixp4xx: npe: Add DT probe code
        soc: ixp4xx: Add DT bindings for IXP4xx NPE
        soc: ixp4xx: qmgr: Pass resources
        soc: ixp4xx: Remove unused functions
        soc: ixp4xx: Uninline several functions
        soc: ixp4xx: npe: Pass addresses as resources
        ARM: ixp4xx: Turn the QMGR into a platform device
        ARM: ixp4xx: Turn the NPE into a platform device
        ...
      22c58fd7
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · a455eda3
      Linus Torvalds authored
      Pull thermal soc updates from Eduardo Valentin:
      
       - thermal core has a new devm_* API for registering cooling devices. I
         took the entire series, that is why you see changes on drivers/hwmon
         in this pull (Guenter Roeck)
      
       - rockchip thermal driver gains support to PX30 SoC (Elaine Zhang)
      
       - the generic-adc thermal driver now considers the lookup table DT
         property as optional (Jean-Francois Dagenais)
      
       - Refactoring of tsens thermal driver (Amit Kucheria)
      
       - Cleanups on cpu cooling driver (Daniel Lezcano)
      
       - broadcom thermal driver dropped support to ACPI (Srinath Mannam)
      
       - tegra thermal driver gains support to OC hw throttle and GPU throtle
         (Wei Ni)
      
       - Fixes in several thermal drivers.
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (59 commits)
        hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register
        hwmon: (npcm750-pwm-fan) Use devm_thermal_of_cooling_device_register
        hwmon: (mlxreg-fan) Use devm_thermal_of_cooling_device_register
        hwmon: (gpio-fan) Use devm_thermal_of_cooling_device_register
        hwmon: (aspeed-pwm-tacho) Use devm_thermal_of_cooling_device_register
        thermal: rcar_gen3_thermal: Fix to show correct trip points number
        thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs
        thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power
        thermal: rockchip: Support the PX30 SoC in thermal driver
        dt-bindings: rockchip-thermal: Support the PX30 SoC compatible
        thermal: rockchip: fix up the tsadc pinctrl setting error
        thermal: broadcom: Remove ACPI support
        thermal: Fix build error of missing devm_ioremap_resource on UM
        thermal/drivers/cpu_cooling: Remove pointless field
        thermal/drivers/cpu_cooling: Add Software Package Data Exchange (SPDX)
        thermal/drivers/cpu_cooling: Fixup the header and copyright
        thermal/drivers/cpu_cooling: Remove pointless test in power2state()
        thermal: rcar_gen3_thermal: disable interrupt in .remove
        thermal: rcar_gen3_thermal: fix interrupt type
        thermal: Introduce devm_thermal_of_cooling_device_register
        ...
      a455eda3
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2019-05-16' of git://anongit.freedesktop.org/drm/drm · cc7ce901
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "A bunch of fixes for the merge window closure, doesn't seem to be
        anything too major or serious in there.
      
        It does add TU117 turing modesetting to nouveau but it's just an
        enable for preexisting code.
      
        amdgpu:
         - gpu reset at load crash fix
         - ATPX hotplug fix for when dGPU is off
         - SR-IOV fixes
      
        radeon:
         - r5xx pll fixes
      
        i915:
         - GVT (MCHBAR, buffer alignment, misc warnings fixes)
         - Fixes for newly enabled semaphore code
         - Geminilake disable framebuffer compression
         - HSW edp fast modeset fix
         - IRQ vs RCU race fix
      
        nouveau:
         - Turing modesetting fixes
         - TU117 support
      
        msm:
         - SDM845 bringup fixes
      
        panfrost:
         - static checker fixes
      
        pl111:
         - spinlock init fix.
      
        bridge:
         - refresh rate register fix for adv7511"
      
      * tag 'drm-next-2019-05-16' of git://anongit.freedesktop.org/drm/drm: (36 commits)
        drm/msm: Upgrade gxpd checks to IS_ERR_OR_NULL
        drm/msm/dpu: Remove duplicate header
        drm/pl111: Initialize clock spinlock early
        drm/msm: correct attempted NULL pointer dereference in debugfs
        drm/msm: remove resv fields from msm_gem_object struct
        drm/nouveau: fix duplication of nv50_head_atom struct
        drm/nouveau/disp/dp: respect sink limits when selecting failsafe link configuration
        drm/nouveau/core: initial support for boards with TU117 chipset
        drm/nouveau/core: allow detected chipset to be overridden
        drm/nouveau/kms/gf119-gp10x: push HeadSetControlOutputResource() mthd when encoders change
        drm/nouveau/kms/nv50-: fix bug preventing non-vsync'd page flips
        drm/nouveau/kms/gv100-: fix spurious window immediate interlocks
        drm/bridge: adv7511: Fix low refresh rate selection
        drm/panfrost: Add missing _fini() calls in panfrost_device_fini()
        drm/panfrost: Only put sync_out if non-NULL
        drm/i915: Seal races between async GPU cancellation, retirement and signaling
        drm/i915: Fix fastset vs. pfit on/off on HSW EDP transcoder
        drm/i915/fbc: disable framebuffer compression on GeminiLake
        drm/amdgpu/psp: move psp version specific function pointers to early_init
        drm/radeon: prefer lower reference dividers
        ...
      cc7ce901
    • Andy Lutomirski's avatar
      x86/speculation/mds: Improve CPU buffer clear documentation · 9d8d0294
      Andy Lutomirski authored
      On x86_64, all returns to usermode go through
      prepare_exit_to_usermode(), with the sole exception of do_nmi().
      This even includes machine checks -- this was added several years
      ago to support MCE recovery.  Update the documentation.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: Frederic Weisbecker <frederic@kernel.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Jon Masters <jcm@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: stable@vger.kernel.org
      Fixes: 04dcbdb8 ("x86/speculation/mds: Clear CPU buffers on exit to user")
      Link: http://lkml.kernel.org/r/999fa9e126ba6a48e9d214d2f18dbde5c62ac55c.1557865329.git.luto@kernel.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      9d8d0294
    • Andy Lutomirski's avatar
      x86/speculation/mds: Revert CPU buffer clear on double fault exit · 88640e1d
      Andy Lutomirski authored
      The double fault ESPFIX path doesn't return to user mode at all --
      it returns back to the kernel by simulating a #GP fault.
      prepare_exit_to_usermode() will run on the way out of
      general_protection before running user code.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: Frederic Weisbecker <frederic@kernel.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Jon Masters <jcm@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: stable@vger.kernel.org
      Fixes: 04dcbdb8 ("x86/speculation/mds: Clear CPU buffers on exit to user")
      Link: http://lkml.kernel.org/r/ac97612445c0a44ee10374f6ea79c222fe22a5c4.1557865329.git.luto@kernel.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      88640e1d
    • Ingo Molnar's avatar
    • Olof Johansson's avatar
      Merge branch 'fixes' into arm/soc · 7a0c4c17
      Olof Johansson authored
      Merge in a few pending fixes from pre-5.1 that didn't get sent in:
      
      MAINTAINERS: update arch/arm/mach-davinci
      ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect
      ARM: dts: imx6q-logicpd: Reduce inrush current on USBH1
      ARM: dts: imx6q-logicpd: Reduce inrush current on start
      ARM: dts: imx: Fix the AR803X phy-mode
      ARM: dts: sun8i: a33: Reintroduce default pinctrl muxing
      arm64: dts: allwinner: a64: Rename hpvcc-supply to cpvdd-supply
      ARM: sunxi: fix a leaked reference by adding missing of_node_put
      ARM: sunxi: fix a leaked reference by adding missing of_node_put
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      7a0c4c17
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 83f3ef3d
      Linus Torvalds authored
      Pull libnvdimm updates from Dan Williams:
       "Just a small collection of fixes this time around.
      
        The new virtio-pmem driver is nearly ready, but some last minute
        device-mapper acks and virtio questions made it prudent to await v5.3.
      
        Other major topics that were brewing on the linux-nvdimm mailing list
        like sub-section hotplug, and other devm_memremap_pages() reworks will
        go upstream through Andrew's tree.
      
        Summary:
      
         - Fix a long standing namespace label corruption scenario when
           re-provisioning capacity for a namespace.
      
         - Restore the ability of the dax_pmem module to be built-in.
      
         - Harden the build for the 'nfit_test' unit test modules so that the
           userspace test harness can ensure all required test modules are
           available"
      
      * tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        drivers/dax: Allow to include DEV_DAX_PMEM as builtin
        libnvdimm/namespace: Fix label tracking error
        tools/testing/nvdimm: add watermarks for dax_pmem* modules
        dax/pmem: Fix whitespace in dax_pmem
      83f3ef3d
    • Linus Torvalds's avatar
      Merge tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 8649efb2
      Linus Torvalds authored
      Pull power supply and reset updates from Sebastian Reichel:
       "Core:
         - Add over-current health state
         - Add standard, adaptive and custom charge types
         - Add new properties for start/end charge threshold
      
        New Drivers / Hardware:
         - UCS1002 Programmable USB Port Power Controller
         - Ingenic JZ47xx Battery Fuel Gauge
         - AXP20x USB Power: Add AXP813 support
         - AT91 poweroff: Add SAM9X60 support
         - OLPC battery: Add XO-1.5 and XO-1.75 support
      
        Misc Changes:
         - syscon-reboot: support mask property
         - AXP288 fuel gauge: Blacklist ACEPC T8/T11. Looks like some vendor
           thought it's a good idea to build a desktop system with a fuel
           gauge, that slowly "discharges"...
         - cpcap-battery: Fix calculation errors
         - misc fixes"
      
      * tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (54 commits)
        power: supply: olpc_battery: force the le/be casts
        power: supply: ucs1002: Fix build error without CONFIG_REGULATOR
        power: supply: ucs1002: Fix wrong return value checking
        power: supply: Add driver for Microchip UCS1002
        dt-bindings: power: supply: Add bindings for Microchip UCS1002
        power: supply: core: Add POWER_SUPPLY_HEALTH_OVERCURRENT constant
        power: supply: core: fix clang -Wunsequenced
        power: supply: core: Add missing documentation for CHARGE_CONTROL_* properties
        power: supply: core: Add CHARGE_CONTROL_{START_THRESHOLD,END_THRESHOLD} properties
        power: supply: core: Add Standard, Adaptive, and Custom charge types
        power: supply: axp288_fuel_gauge: Add ACEPC T8 and T11 mini PCs to the blacklist
        power: supply: bq27xxx_battery: Notify also about status changes
        power: supply: olpc_battery: Have the framework register sysfs files for us
        power: supply: olpc_battery: Add OLPC XO 1.75 support
        power: supply: olpc_battery: Avoid using platform_info
        power: supply: olpc_battery: Use devm_power_supply_register()
        power: supply: olpc_battery: Move priv data to a struct
        power: supply: olpc_battery: Use DT to get battery version
        x86/platform/olpc: Use a correct version when making up a battery node
        x86/platform/olpc: Trivial code move in DT fixup
        ...
      8649efb2
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.2b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 5fd09ba6
      Linus Torvalds authored
      Pull xen updates from Juergen Gross:
      
       - some minor cleanups
      
       - two small corrections for Xen on ARM
      
       - two fixes for Xen PVH guest support
      
       - a patch for a new command line option to tune virtual timer handling
      
      * tag 'for-linus-5.2b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/arm: Use p2m entry with lock protection
        xen/arm: Free p2m entry if fail to add it to RB tree
        xen/pvh: correctly setup the PV EFI interface for dom0
        xen/pvh: set xen_domain_type to HVM in xen_pvh_init
        xenbus: drop useless LIST_HEAD in xenbus_write_watch() and xenbus_file_write()
        xen-netfront: mark expected switch fall-through
        xen: xen-pciback: fix warning Using plain integer as NULL pointer
        x86/xen: Add "xen_timer_slop" command line option
      5fd09ba6
    • Tony Luck's avatar
      ia64: Make sure that we have a mmiowb function real early · 8a635ffb
      Tony Luck authored
      Generic kernels feed many operation through the "machvec" logic to get
      the correct form of the operation for the current system.  "mmiowb()" is
      one of those operations.
      
      Although machvec is initialized very early in boot, it isn't early
      enough for a recent upstream kernel change that added mmiowb to the
      spin_unlock() path.
      
      Statically initialize the mmiowb field of machvec so that we won't die
      with a call through a NULL pointer.  This should be safe because we do
      the real initialization of machvec before bringing up any addtional CPUs
      or doing any I/O.
      
      Fixes: 49ca6462 ("ia64/mmiowb: Add unconditional mmiowb() to arch_spin_unlock()")
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8a635ffb
    • Linus Torvalds's avatar
      Merge tag 'nfsd-5.2' of git://linux-nfs.org/~bfields/linux · 700a800a
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "This consists mostly of nfsd container work:
      
        Scott Mayhew revived an old api that communicates with a userspace
        daemon to manage some on-disk state that's used to track clients
        across server reboots. We've been using a usermode_helper upcall for
        that, but it's tough to run those with the right namespaces, so a
        daemon is much friendlier to container use cases.
      
        Trond fixed nfsd's handling of user credentials in user namespaces. He
        also contributed patches that allow containers to support different
        sets of NFS protocol versions.
      
        The only remaining container bug I'm aware of is that the NFS reply
        cache is shared between all containers. If anyone's aware of other
        gaps in our container support, let me know.
      
        The rest of this is miscellaneous bugfixes"
      
      * tag 'nfsd-5.2' of git://linux-nfs.org/~bfields/linux: (23 commits)
        nfsd: update callback done processing
        locks: move checks from locks_free_lock() to locks_release_private()
        nfsd: fh_drop_write in nfsd_unlink
        nfsd: allow fh_want_write to be called twice
        nfsd: knfsd must use the container user namespace
        SUNRPC: rsi_parse() should use the current user namespace
        SUNRPC: Fix the server AUTH_UNIX userspace mappings
        lockd: Pass the user cred from knfsd when starting the lockd server
        SUNRPC: Temporary sockets should inherit the cred from their parent
        SUNRPC: Cache the process user cred in the RPC server listener
        nfsd: Allow containers to set supported nfs versions
        nfsd: Add custom rpcbind callbacks for knfsd
        SUNRPC: Allow further customisation of RPC program registration
        SUNRPC: Clean up generic dispatcher code
        SUNRPC: Add a callback to initialise server requests
        SUNRPC/nfs: Fix return value for nfs4_callback_compound()
        nfsd: handle legacy client tracking records sent by nfsdcld
        nfsd: re-order client tracking method selection
        nfsd: keep a tally of RECLAIM_COMPLETE operations when using nfsdcld
        nfsd: un-deprecate nfsdcld
        ...
      700a800a
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-fixes-2019-05-15' of... · 8da0e152
      Dave Airlie authored
      Merge tag 'drm-misc-next-fixes-2019-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
      
      - A couple new panfrost fixes
      - Fix the low refresh rate register in adv7511
      - A handful of msm fixes that fell out of 5.1 bringup on SDM845
      - Fix spinlock initialization in pl111
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Sean Paul <sean@poorly.run>
      Link: https://patchwork.freedesktop.org/patch/msgid/20190515201729.GA89093@art_vandelay
      8da0e152
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2019-05-15' of... · dc28d574
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2019-05-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
      
      - Disable framebuffer compression on Geminilake
      - Fixes for HSW EDP fastset and a IRQ handler vs. RCU race
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20190515074817.GA10472@jlahtine-desk.ger.corp.intel.com
      dc28d574
  2. 15 May, 2019 13 commits