Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:49:00 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993016AbeEOMtDYtue0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:31:47 2018 +0200 Commit: c0b064e468e8ed9f9436c9c331e0785409d1329c Gitweb: https://git.linux-mips.org/g/ralf/linux/c0b064e468e8 Branch: master --- Documentation/PCI/pci.txt | 4 .../devicetree/bindings/auxdisplay/arm-charlcd.txt | 0 Documentation/devicetree/bindings/eeprom/at24.txt | 2 .../bindings/interrupt-controller/renesas,irqc.txt | 1 .../devicetree/bindings/power/wakeup-source.txt | 2 .../devicetree/bindings/thermal/imx-thermal.txt | 25 + Documentation/media/dmx.h.rst.exceptions | 14 - Documentation/media/uapi/dvb/dmx-qbuf.rst | 7 Documentation/virtual/kvm/api.txt | 40 +- Documentation/virtual/kvm/cpuid.txt | 4 Documentation/virtual/kvm/msr.txt | 3 Documentation/x86/intel_rdt_ui.txt | 2 MAINTAINERS | 25 + Makefile | 19 - arch/arc/Kconfig | 1 arch/arc/boot/dts/axs101.dts | 2 arch/arc/boot/dts/axs10x_mb.dtsi | 4 arch/arc/boot/dts/haps_hs_idu.dts | 2 arch/arc/boot/dts/nsim_700.dts | 2 arch/arc/boot/dts/nsim_hs.dts | 2 arch/arc/boot/dts/nsim_hs_idu.dts | 2 arch/arc/boot/dts/nsimosci.dts | 2 arch/arc/boot/dts/nsimosci_hs.dts | 2 arch/arc/boot/dts/nsimosci_hs_idu.dts | 2 arch/arc/include/asm/entry-arcv2.h | 2 arch/arc/kernel/mcip.c | 74 +++ arch/arc/kernel/setup.c | 2 arch/arc/kernel/smp.c | 50 ++ arch/arc/mm/cache.c | 5 arch/arm/boot/dts/bcm11351.dtsi | 2 arch/arm/boot/dts/bcm21664.dtsi | 2 arch/arm/boot/dts/bcm2835.dtsi | 6 arch/arm/boot/dts/bcm2836.dtsi | 12 arch/arm/boot/dts/bcm2837.dtsi | 2 arch/arm/boot/dts/bcm283x.dtsi | 2 arch/arm/boot/dts/bcm958625hr.dts | 2 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 arch/arm/boot/dts/imx6dl-icore-rqs.dts | 2 arch/arm/boot/dts/logicpd-som-lv.dtsi | 9 arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 8 arch/arm/boot/dts/omap5-uevm.dts | 2 arch/arm/boot/dts/rk3036.dtsi | 4 arch/arm/boot/dts/rk322x.dtsi | 6 arch/arm/boot/dts/rk3288-phycore-som.dtsi | 20 - arch/arm/boot/dts/zx296702.dtsi | 20 - arch/arm/configs/omap2plus_defconfig | 2 arch/arm/kvm/hyp/Makefile | 5 arch/arm/kvm/hyp/banked-sr.c | 4 arch/arm/mach-clps711x/board-dt.c | 2 arch/arm/mach-davinci/board-dm355-evm.c | 2 arch/arm/mach-davinci/board-dm355-leopard.c | 2 arch/arm/mach-davinci/board-dm365-evm.c | 2 arch/arm/mach-mvebu/Kconfig | 4 arch/arm/mach-omap1/clock.c | 6 arch/arm/mach-omap2/omap-wakeupgen.c | 4 arch/arm/mach-omap2/omap_hwmod.c | 6 arch/arm/mach-omap2/pm.c | 4 arch/arm/mach-omap2/timer.c | 19 - arch/arm/plat-orion/common.c | 23 - arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 1 arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 3 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 6 arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 7 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 arch/parisc/include/asm/cacheflush.h | 1 arch/parisc/include/asm/processor.h | 2 arch/parisc/kernel/cache.c | 57 +- arch/parisc/kernel/head.S | 18 - arch/parisc/kernel/pacache.S | 22 + arch/parisc/kernel/smp.c | 7 arch/parisc/kernel/time.c | 11 arch/parisc/mm/init.c | 7 arch/riscv/include/asm/barrier.h | 6 arch/s390/kvm/intercept.c | 51 +- arch/s390/kvm/interrupt.c | 123 +++-- arch/s390/kvm/kvm-s390.c | 79 ++- arch/s390/kvm/kvm-s390.h | 7 arch/s390/kvm/priv.c | 192 ++++---- arch/s390/kvm/vsie.c | 20 + arch/sh/boot/dts/Makefile | 4 arch/x86/Kconfig | 1 arch/x86/Makefile | 7 arch/x86/entry/calling.h | 34 + arch/x86/entry/entry_32.S | 3 arch/x86/entry/entry_64.S | 155 ++++-- arch/x86/entry/entry_64_compat.S | 71 ++- arch/x86/include/asm/apm.h | 6 arch/x86/include/asm/asm-prototypes.h | 3 arch/x86/include/asm/bitops.h | 29 + arch/x86/include/asm/cpufeatures.h | 1 arch/x86/include/asm/efi.h | 17 + arch/x86/include/asm/kvm_host.h | 6 arch/x86/include/asm/microcode.h | 9 arch/x86/include/asm/mmu_context.h | 1 arch/x86/include/asm/nospec-branch.h | 138 +++++ arch/x86/include/asm/paravirt.h | 17 + arch/x86/include/asm/paravirt_types.h | 5 arch/x86/include/asm/percpu.h | 2 arch/x86/include/asm/pgtable.h | 8 arch/x86/include/asm/pgtable_32.h | 1 arch/x86/include/asm/pgtable_64.h | 1 arch/x86/include/asm/pgtable_types.h | 10 arch/x86/include/asm/processor.h | 1 arch/x86/include/asm/refcount.h | 6 arch/x86/include/asm/rmwcc.h | 16 - arch/x86/include/uapi/asm/kvm_para.h | 1 arch/x86/kernel/apic/io_apic.c | 2 arch/x86/kernel/cpu/bugs.c | 12 arch/x86/kernel/cpu/common.c | 30 + arch/x86/kernel/cpu/microcode/amd.c | 10 arch/x86/kernel/cpu/microcode/core.c | 39 +- arch/x86/kernel/cpu/microcode/intel.c | 10 arch/x86/kernel/head_64.S | 2 arch/x86/kernel/kvm.c | 20 - arch/x86/kernel/setup.c | 17 - arch/x86/kernel/setup_percpu.c | 17 - arch/x86/kernel/unwind_orc.c | 3 arch/x86/kvm/cpuid.c | 3 arch/x86/kvm/lapic.c | 11 arch/x86/kvm/mmu.c | 2 arch/x86/kvm/svm.c | 90 +++- arch/x86/kvm/vmx.c | 26 + arch/x86/kvm/x86.c | 107 ++++ arch/x86/lib/Makefile | 1 arch/x86/lib/retpoline.S | 56 -- arch/x86/mm/cpu_entry_area.c | 6 arch/x86/mm/fault.c | 4 arch/x86/mm/init_32.c | 15 + arch/x86/mm/mem_encrypt_boot.S | 2 arch/x86/platform/intel-mid/intel-mid.c | 2 arch/x86/realmode/rm/trampoline_64.S | 2 arch/x86/xen/enlighten_pv.c | 6 arch/x86/xen/suspend.c | 16 + block/blk-cgroup.c | 11 block/blk-core.c | 2 block/blk-mq.c | 4 block/genhd.c | 48 ++ block/ioctl.c | 2 block/kyber-iosched.c | 1 block/mq-deadline.c | 16 + block/partition-generic.c | 6 drivers/block/amiflop.c | 2 drivers/block/ataflop.c | 2 drivers/block/brd.c | 2 drivers/block/floppy.c | 2 drivers/block/loop.c | 2 drivers/block/nbd.c | 2 drivers/block/pktcdvd.c | 2 drivers/block/swim.c | 2 drivers/block/z2ram.c | 2 drivers/bus/ti-sysc.c | 2 drivers/char/tpm/st33zp24/st33zp24.c | 4 drivers/char/tpm/tpm-interface.c | 4 drivers/char/tpm/tpm2-cmd.c | 4 drivers/char/tpm/tpm_i2c_infineon.c | 5 drivers/char/tpm/tpm_i2c_nuvoton.c | 8 drivers/char/tpm/tpm_tis_core.c | 5 drivers/clocksource/arc_timer.c | 11 drivers/clocksource/fsl_ftm_timer.c | 2 drivers/clocksource/mips-gic-timer.c | 2 drivers/cpufreq/Kconfig.arm | 6 drivers/cpufreq/s3c24xx-cpufreq.c | 8 drivers/cpufreq/scpi-cpufreq.c | 16 - drivers/crypto/ccp/psp-dev.c | 8 drivers/dax/super.c | 6 drivers/edac/sb_edac.c | 2 drivers/gpio/gpiolib-of.c | 15 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 - drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 7 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 18 - drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 6 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 18 - drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 11 drivers/gpu/drm/drm_framebuffer.c | 4 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 drivers/gpu/drm/i915/i915_gem_request.c | 4 drivers/gpu/drm/i915/i915_reg.h | 4 drivers/gpu/drm/i915/intel_audio.c | 6 drivers/gpu/drm/nouveau/nv50_display.c | 1 drivers/gpu/drm/radeon/radeon_device.c | 4 drivers/gpu/drm/radeon/radeon_pm.c | 6 drivers/gpu/drm/sun4i/sun4i_tcon.c | 7 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 17 - drivers/i2c/busses/i2c-octeon-core.c | 1 drivers/i2c/busses/i2c-octeon-core.h | 2 drivers/ide/ide-probe.c | 2 drivers/md/bcache/request.c | 2 drivers/md/bcache/super.c | 2 drivers/md/md-multipath.c | 2 drivers/md/md.c | 53 ++ drivers/md/md.h | 2 drivers/md/raid1.c | 11 drivers/md/raid1.h | 12 drivers/md/raid10.c | 18 - drivers/md/raid10.h | 13 + drivers/md/raid5-log.h | 3 drivers/md/raid5-ppl.c | 10 drivers/md/raid5.c | 19 - drivers/md/raid5.h | 12 drivers/media/Kconfig | 2 drivers/media/common/videobuf2/Kconfig | 3 drivers/media/common/videobuf2/Makefile | 9 drivers/media/common/videobuf2/vb2-trace.c | 0 drivers/media/dvb-core/Makefile | 2 drivers/media/dvb-core/dmxdev.c | 115 +++-- drivers/media/dvb-core/dvb_demux.c | 112 +++- drivers/media/dvb-core/dvb_net.c | 5 drivers/media/dvb-core/dvb_vb2.c | 31 + drivers/media/dvb-frontends/m88ds3103.c | 7 drivers/media/i2c/tvp5150.c | 88 ++- drivers/media/pci/ttpci/av7110.c | 5 drivers/media/pci/ttpci/av7110_av.c | 6 drivers/media/usb/au0828/Kconfig | 2 drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 drivers/media/v4l2-core/Kconfig | 1 drivers/media/v4l2-core/Makefile | 3 drivers/memory/brcmstb_dpfe.c | 74 ++- drivers/mmc/core/mmc_ops.c | 4 drivers/mmc/host/dw_mmc-exynos.c | 1 drivers/mmc/host/dw_mmc-k3.c | 4 drivers/mmc/host/dw_mmc-rockchip.c | 1 drivers/mmc/host/dw_mmc-zx.c | 1 drivers/mmc/host/dw_mmc.c | 84 ++- drivers/mmc/host/dw_mmc.h | 2 drivers/mmc/host/sdhci-pci-core.c | 35 + drivers/net/xen-netfront.c | 7 drivers/nvdimm/pmem.c | 3 drivers/nvme/host/core.c | 12 drivers/nvme/host/fabrics.c | 2 drivers/nvme/host/multipath.c | 15 - drivers/nvme/host/pci.c | 5 drivers/nvme/host/rdma.c | 4 drivers/nvme/target/core.c | 9 drivers/nvme/target/loop.c | 4 drivers/pci/setup-res.c | 4 drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 drivers/platform/x86/intel-hid.c | 1 drivers/platform/x86/intel-vbtn.c | 47 +- drivers/platform/x86/wmi.c | 6 drivers/soc/imx/gpc.c | 10 drivers/vfio/vfio_iommu_type1.c | 18 + drivers/watchdog/Kconfig | 4 drivers/xen/events/events_base.c | 4 drivers/xen/pvcalls-back.c | 2 drivers/xen/pvcalls-front.c | 11 fs/block_dev.c | 49 +- fs/btrfs/ctree.h | 7 fs/btrfs/inode-item.c | 44 +- fs/btrfs/inode.c | 11 fs/btrfs/relocation.c | 18 + fs/btrfs/send.c | 3 fs/btrfs/super.c | 2 fs/btrfs/sysfs.c | 8 fs/btrfs/transaction.c | 20 - fs/btrfs/tree-log.c | 114 ++++- fs/btrfs/volumes.c | 11 fs/ceph/caps.c | 26 + fs/ceph/dir.c | 28 - fs/ceph/super.c | 27 + fs/ceph/super.h | 2 fs/direct-io.c | 3 fs/xfs/scrub/agheader.c | 3 fs/xfs/xfs_refcount_item.c | 9 fs/xfs/xfs_rmap_item.c | 4 fs/xfs/xfs_super.c | 2 include/drm/drm_drv.h | 1 include/linux/bio.h | 4 include/linux/compiler-clang.h | 5 include/linux/compiler-gcc.h | 4 include/linux/fs.h | 2 include/linux/genhd.h | 4 include/linux/init.h | 8 include/linux/jump_label.h | 3 include/linux/kernel.h | 1 include/linux/kvm_host.h | 6 include/linux/nospec.h | 26 - include/media/demux.h | 21 + include/media/dmxdev.h | 2 include/media/dvb_demux.h | 4 include/media/dvb_vb2.h | 20 + include/soc/arc/mcip.h | 5 include/uapi/drm/virtgpu_drm.h | 1 include/uapi/linux/blktrace_api.h | 2 include/uapi/linux/dvb/dmx.h | 35 + include/uapi/linux/kvm.h | 2 include/uapi/linux/psp-sev.h | 2 init/main.c | 2 kernel/extable.c | 2 kernel/jump_label.c | 27 + kernel/memremap.c | 15 - kernel/printk/printk.c | 3 kernel/time/timer.c | 6 lib/dma-debug.c | 10 lib/idr.c | 13 - net/ceph/ceph_common.c | 7 samples/seccomp/Makefile | 10 scripts/Makefile.build | 8 scripts/coccinelle/api/memdup.cocci | 4 scripts/kallsyms.c | 2 scripts/kconfig/confdata.c | 2 scripts/kconfig/kxgettext.c | 2 scripts/kconfig/lkc.h | 1 scripts/kconfig/lxdialog/check-lxdialog.sh | 3 scripts/kconfig/menu.c | 1 scripts/kconfig/symbol.c | 4 scripts/kconfig/util.c | 11 scripts/kconfig/zconf.l | 12 scripts/kconfig/zconf.y | 3 scripts/link-vmlinux.sh | 2 sound/core/control.c | 2 sound/pci/hda/hda_intel.c | 38 +- sound/pci/hda/patch_realtek.c | 3 sound/usb/quirks-table.h | 47 ++ sound/x86/intel_hdmi_audio.c | 37 + tools/kvm/kvm_stat/kvm_stat | 503 +++++++++++--------- tools/kvm/kvm_stat/kvm_stat.txt | 4 tools/objtool/builtin-check.c | 6 tools/objtool/builtin-orc.c | 6 tools/objtool/builtin.h | 5 tools/objtool/check.c | 106 ++++ tools/objtool/check.h | 3 tools/testing/radix-tree/idr-test.c | 52 ++ tools/testing/radix-tree/linux.c | 11 tools/testing/radix-tree/linux/compiler_types.h | 0 tools/testing/radix-tree/linux/gfp.h | 1 tools/testing/radix-tree/linux/slab.h | 6 tools/testing/selftests/android/Makefile | 8 tools/testing/selftests/futex/Makefile | 6 tools/testing/selftests/memfd/config | 1 tools/testing/selftests/memory-hotplug/Makefile | 2 tools/testing/selftests/pstore/config | 1 tools/testing/selftests/sync/Makefile | 2 tools/testing/selftests/vDSO/Makefile | 14 - tools/testing/selftests/vm/.gitignore | 1 virt/kvm/arm/arch_timer.c | 116 +++-- virt/kvm/kvm_main.c | 3 350 files changed, 3468 insertions(+), 1745 deletions(-)