Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

Pull assorted small fixes queued for merge window.
2026-09-26 18:16:26 +00:00 · 2018-01-31 16:23:58 +01:00 · 2018-01-31 16:23:58 +01:00 · c86aa0129c
commit c86aa0129c
parent e56236b0b2 648d493299 7ad81482ca
8682 changed files with 487516 additions and 198671 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
--- a/include/asm-generic/audit_dir_write.h
+++ b/include/asm-generic/audit_dir_write.h
--- a/include/asm-generic/audit_write.h
+++ b/include/asm-generic/audit_write.h
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
--- a/include/asm-generic/mm_hooks.h
+++ b/include/asm-generic/mm_hooks.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
--- a/include/crypto/mcryptd.h
+++ b/include/crypto/mcryptd.h
--- a/include/drm/bridge/mhl.h
+++ b/include/drm/bridge/mhl.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
--- a/include/drm/drm_auth.h
+++ b/include/drm/drm_auth.h
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_encoder.h
+++ b/include/drm/drm_encoder.h
--- a/include/drm/drm_fb_cma_helper.h
+++ b/include/drm/drm_fb_cma_helper.h
--- a/include/drm/drm_framebuffer.h
+++ b/include/drm/drm_framebuffer.h
--- a/include/drm/drm_gem_framebuffer_helper.h
+++ b/include/drm/drm_gem_framebuffer_helper.h
--- a/include/drm/drm_lease.h
+++ b/include/drm/drm_lease.h
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
--- a/include/drm/drm_mode_object.h
+++ b/include/drm/drm_mode_object.h
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
--- a/include/drm/drm_modeset_lock.h
+++ b/include/drm/drm_modeset_lock.h
--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
--- a/include/drm/drm_property.h
+++ b/include/drm/drm_property.h
--- a/include/drm/drm_syncobj.h
+++ b/include/drm/drm_syncobj.h
--- a/include/drm/drm_vblank.h
+++ b/include/drm/drm_vblank.h
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
--- a/include/drm/ttm/ttm_debug.h
+++ b/include/drm/ttm/ttm_debug.h
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
--- a/include/dt-bindings/clock/exynos4.h
+++ b/include/dt-bindings/clock/exynos4.h
--- a/include/dt-bindings/clock/gxbb-clkc.h
+++ b/include/dt-bindings/clock/gxbb-clkc.h
--- a/include/dt-bindings/clock/imx7d-clock.h
+++ b/include/dt-bindings/clock/imx7d-clock.h
--- a/include/dt-bindings/clock/mt2712-clk.h
+++ b/include/dt-bindings/clock/mt2712-clk.h
--- a/include/dt-bindings/clock/mt7622-clk.h
+++ b/include/dt-bindings/clock/mt7622-clk.h
--- a/include/dt-bindings/clock/qcom,rpmcc.h
+++ b/include/dt-bindings/clock/qcom,rpmcc.h
--- a/include/dt-bindings/clock/r7s72100-clock.h
+++ b/include/dt-bindings/clock/r7s72100-clock.h
--- a/include/dt-bindings/clock/r8a77970-cpg-mssr.h
+++ b/include/dt-bindings/clock/r8a77970-cpg-mssr.h
--- a/include/dt-bindings/clock/rk3188-cru-common.h
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
--- a/include/dt-bindings/clock/rk3368-cru.h
+++ b/include/dt-bindings/clock/rk3368-cru.h
--- a/include/dt-bindings/clock/s3c2443.h
+++ b/include/dt-bindings/clock/s3c2443.h
--- a/include/dt-bindings/clock/sun4i-a10-ccu.h
+++ b/include/dt-bindings/clock/sun4i-a10-ccu.h
--- a/include/dt-bindings/clock/sun6i-a31-ccu.h
+++ b/include/dt-bindings/clock/sun6i-a31-ccu.h
--- a/include/dt-bindings/clock/tegra210-car.h
+++ b/include/dt-bindings/clock/tegra210-car.h
--- a/include/dt-bindings/gpio/meson-gxbb-gpio.h
+++ b/include/dt-bindings/gpio/meson-gxbb-gpio.h
--- a/include/dt-bindings/gpio/meson-gxl-gpio.h
+++ b/include/dt-bindings/gpio/meson-gxl-gpio.h
--- a/include/dt-bindings/pinctrl/am43xx.h
+++ b/include/dt-bindings/pinctrl/am43xx.h
--- a/include/dt-bindings/pinctrl/stm32-pinfunc.h
+++ b/include/dt-bindings/pinctrl/stm32-pinfunc.h
--- a/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
+++ b/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
--- a/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
+++ b/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
--- a/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
+++ b/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
--- a/include/dt-bindings/power/r8a77970-sysc.h
+++ b/include/dt-bindings/power/r8a77970-sysc.h
--- a/include/dt-bindings/reset/mt7622-reset.h
+++ b/include/dt-bindings/reset/mt7622-reset.h
--- a/include/dt-bindings/thermal/tegra186-bpmp-thermal.h
+++ b/include/dt-bindings/thermal/tegra186-bpmp-thermal.h
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
--- a/include/linux/acpi_iort.h
+++ b/include/linux/acpi_iort.h
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/avf/virtchnl.h
+++ b/include/linux/avf/virtchnl.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/balloon_compaction.h
+++ b/include/linux/balloon_compaction.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bitfield.h
+++ b/include/linux/bitfield.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
--- a/include/linux/bug.h
+++ b/include/linux/bug.h
--- a/include/linux/byteorder/generic.h
+++ b/include/linux/byteorder/generic.h
--- a/include/linux/c2port.h
+++ b/include/linux/c2port.h
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
--- a/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
--- a/Show more
+++ b/Show more