Merge tag 'v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:51:42 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993339AbeEOMvoY50w0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:36:41 2018 +0200 Commit: 9037a854f20ffa4346431a22a4c042466995bf4c Gitweb: https://git.linux-mips.org/g/ralf/linux/9037a854f20f Branch: master --- .../bindings/serial/amlogic,meson-uart.txt | 2 .../devicetree/bindings/serial/mvebu-uart.txt | 2 .../bindings/serial/renesas,sci-serial.txt | 2 Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 .../driver-api/firmware/request_firmware.rst | 16 - Documentation/driver-api/infrastructure.rst | 2 Documentation/driver-api/usb/typec.rst | 2 Documentation/i2c/dev-interface | 32 +- Documentation/ioctl/ioctl-number.txt | 2 Documentation/networking/ip-sysctl.txt | 15 - Documentation/power/suspend-and-cpuhotplug.txt | 2 Documentation/process/magic-number.rst | 3 Documentation/trace/ftrace.rst | 14 + Documentation/virtual/kvm/api.txt | 9 - Documentation/virtual/kvm/arm/psci.txt | 30 ++ MAINTAINERS | 27 +- Makefile | 2 arch/arm/boot/dts/gemini-nas4220b.dts | 28 +- arch/arm/boot/dts/omap4.dtsi | 8 arch/arm/configs/gemini_defconfig | 27 ++ arch/arm/configs/socfpga_defconfig | 1 arch/arm/include/asm/kvm_host.h | 3 arch/arm/include/uapi/asm/kvm.h | 6 arch/arm/kvm/guest.c | 13 + arch/arm/mach-omap2/Makefile | 6 arch/arm/mach-omap2/pm-asm-offsets.c | 3 arch/arm/mach-omap2/sleep33xx.S | 1 arch/arm/mach-omap2/sleep43xx.S | 1 arch/arm/mach-s3c24xx/mach-jive.c | 4 arch/arm64/Makefile | 4 .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 61 ++++ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 17 + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 .../boot/dts/broadcom/stingray/stingray-sata.dtsi | 80 ++--- arch/arm64/include/asm/kvm_host.h | 3 arch/arm64/include/asm/module.h | 2 arch/arm64/include/asm/pgtable.h | 4 arch/arm64/include/uapi/asm/kvm.h | 6 arch/arm64/kernel/cpufeature.c | 1 arch/arm64/kernel/module-plts.c | 2 arch/arm64/kernel/module.c | 2 arch/arm64/kernel/ptrace.c | 20 + arch/arm64/kernel/traps.c | 3 arch/arm64/kvm/guest.c | 14 + arch/arm64/kvm/sys_regs.c | 6 arch/arm64/lib/Makefile | 4 arch/arm64/mm/flush.c | 2 arch/powerpc/include/asm/powernv.h | 2 arch/powerpc/kernel/mce_power.c | 7 arch/powerpc/kernel/smp.c | 49 +++ arch/powerpc/kvm/booke.c | 7 arch/powerpc/mm/mem.c | 2 arch/powerpc/platforms/powernv/memtrace.c | 17 - arch/powerpc/platforms/powernv/npu-dma.c | 88 +++++ arch/powerpc/platforms/powernv/opal-rtc.c | 8 arch/riscv/Kconfig | 4 arch/riscv/include/asm/Kbuild | 1 arch/riscv/kernel/vdso/Makefile | 2 arch/s390/include/asm/thread_info.h | 3 arch/s390/kernel/module.c | 4 arch/s390/kernel/perf_cpum_cf_events.c | 8 arch/s390/kernel/process.c | 10 + arch/s390/kernel/uprobes.c | 9 + arch/x86/Kconfig | 4 arch/x86/entry/entry_64_compat.S | 8 arch/x86/events/intel/core.c | 9 - arch/x86/include/asm/cpufeatures.h | 1 arch/x86/include/asm/ftrace.h | 19 + arch/x86/include/asm/irq_vectors.h | 7 arch/x86/include/asm/jailhouse_para.h | 2 arch/x86/include/asm/pgtable.h | 5 arch/x86/include/asm/pgtable_64_types.h | 8 arch/x86/include/uapi/asm/msgbuf.h | 31 ++ arch/x86/include/uapi/asm/shmbuf.h | 42 +++ arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/cpu/microcode/core.c | 6 arch/x86/kernel/cpu/microcode/intel.c | 2 arch/x86/kernel/jailhouse.c | 2 arch/x86/kernel/setup.c | 6 arch/x86/kernel/smpboot.c | 2 arch/x86/kvm/vmx.c | 14 - arch/x86/kvm/x86.h | 7 arch/x86/mm/pageattr.c | 44 ++- arch/x86/mm/pti.c | 26 +- block/bfq-iosched.c | 10 + block/blk-cgroup.c | 28 +- block/blk-core.c | 15 - block/blk-mq.c | 41 ++- block/blk-mq.h | 3 crypto/api.c | 11 - crypto/drbg.c | 2 drivers/acpi/acpi_video.c | 27 ++ drivers/acpi/acpi_watchdog.c | 59 +++- drivers/acpi/button.c | 24 + drivers/acpi/scan.c | 2 drivers/acpi/sleep.c | 13 + drivers/amba/bus.c | 17 + drivers/android/binder.c | 8 drivers/base/dma-coherent.c | 5 drivers/base/dma-mapping.c | 6 drivers/base/firmware_loader/fallback.c | 4 drivers/base/firmware_loader/fallback.h | 2 drivers/block/loop.c | 64 +++- drivers/block/loop.h | 1 drivers/block/swim.c | 49 +-- drivers/block/swim3.c | 6 drivers/bus/Kconfig | 1 drivers/cdrom/cdrom.c | 2 drivers/char/random.c | 48 +++ drivers/char/virtio_console.c | 157 ++++------ drivers/cpufreq/Kconfig.arm | 10 - drivers/cpufreq/brcmstb-avs-cpufreq.c | 323 -------------------- drivers/cpufreq/powernv-cpufreq.c | 14 + drivers/firmware/arm_scmi/clock.c | 2 drivers/fpga/altera-ps-spi.c | 2 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 drivers/gpu/drm/amd/amdkfd/Kconfig | 1 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 17 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 5 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 54 +-- drivers/gpu/drm/drm_edid.c | 11 - drivers/gpu/drm/i915/intel_cdclk.c | 16 + drivers/gpu/drm/i915/intel_drv.h | 4 drivers/gpu/drm/i915/intel_fbdev.c | 2 drivers/gpu/drm/i915/intel_runtime_pm.c | 11 - drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 drivers/gpu/drm/msm/disp/mdp_format.c | 3 drivers/gpu/drm/msm/disp/mdp_kms.h | 2 drivers/gpu/drm/msm/dsi/dsi_host.c | 16 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 109 +++++++ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 2 drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 28 -- drivers/gpu/drm/msm/msm_fb.c | 3 drivers/gpu/drm/msm/msm_fbdev.c | 11 - drivers/gpu/drm/msm/msm_gem.c | 20 + drivers/gpu/drm/msm/msm_kms.h | 5 drivers/gpu/drm/qxl/qxl_cmd.c | 6 drivers/gpu/drm/qxl/qxl_drv.h | 1 drivers/gpu/drm/qxl/qxl_ioctl.c | 4 drivers/gpu/drm/qxl/qxl_release.c | 18 + drivers/gpu/drm/sun4i/sun4i_lvds.c | 55 --- drivers/gpu/drm/virtio/virtgpu_vq.c | 4 drivers/hwmon/k10temp.c | 17 + drivers/hwmon/nct6683.c | 4 drivers/hwmon/scmi-hwmon.c | 5 drivers/i2c/busses/Kconfig | 3 drivers/i2c/busses/i2c-sprd.c | 22 + drivers/i2c/i2c-dev.c | 2 drivers/input/evdev.c | 7 drivers/memory/emif-asm-offsets.c | 72 ---- drivers/message/fusion/mptsas.c | 1 drivers/mtd/chips/cfi_cmdset_0001.c | 33 ++ drivers/mtd/chips/cfi_cmdset_0002.c | 9 - drivers/mtd/nand/core.c | 3 drivers/mtd/nand/raw/marvell_nand.c | 25 -- drivers/mtd/nand/raw/tango_nand.c | 2 drivers/mtd/spi-nor/cadence-quadspi.c | 19 + drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 16 + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 196 +++++++++++- drivers/net/ethernet/amd/xgbe/xgbe.h | 9 + drivers/net/ethernet/ibm/ibmvnic.c | 4 drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 2 drivers/net/ethernet/intel/ice/ice_common.c | 22 + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 2 drivers/net/ethernet/intel/ice/ice_main.c | 4 drivers/net/ethernet/intel/ice/ice_sched.c | 4 drivers/net/ethernet/intel/igb/igb_main.c | 17 + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 drivers/net/ethernet/sfc/ef10.c | 80 +++-- drivers/net/ethernet/sfc/efx.c | 143 +++++++++ drivers/net/ethernet/sfc/efx.h | 21 + drivers/net/ethernet/sfc/farch.c | 41 ++- drivers/net/ethernet/sfc/net_driver.h | 36 ++ drivers/net/ethernet/sfc/rx.c | 62 ++++ drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/phy/marvell.c | 9 + drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 19 + drivers/of/fdt.c | 7 drivers/pci/dwc/pcie-kirin.c | 2 drivers/pci/host/pci-aardvark.c | 53 ++- drivers/pci/pci-driver.c | 5 drivers/pci/pci.c | 4 drivers/rtc/rtc-opal.c | 37 +- drivers/s390/block/dasd_alias.c | 13 + drivers/s390/cio/chsc.c | 14 + drivers/s390/cio/vfio_ccw_fsm.c | 19 + drivers/s390/net/qeth_core.h | 2 drivers/s390/net/qeth_core_main.c | 158 ++++------ drivers/s390/net/qeth_core_mpc.h | 12 + drivers/s390/net/qeth_l2_main.c | 59 ++-- drivers/scsi/fnic/fnic_trace.c | 2 drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 drivers/scsi/scsi_debug.c | 33 +- drivers/scsi/scsi_transport_iscsi.c | 29 +- drivers/scsi/sd.c | 2 drivers/scsi/sd_zbc.c | 140 +++++---- drivers/scsi/ufs/ufshcd.c | 40 ++ drivers/slimbus/messaging.c | 2 drivers/soc/bcm/raspberrypi-power.c | 2 drivers/staging/wilc1000/host_interface.c | 2 drivers/target/target_core_pscsi.c | 2 drivers/tty/n_gsm.c | 23 + drivers/tty/serial/earlycon.c | 6 drivers/tty/serial/imx.c | 19 + drivers/tty/serial/mvebu-uart.c | 1 drivers/tty/serial/qcom_geni_serial.c | 10 - drivers/tty/serial/xilinx_uartps.c | 2 drivers/tty/tty_io.c | 5 drivers/tty/tty_ldisc.c | 29 +- drivers/uio/uio_hv_generic.c | 72 +--- drivers/usb/Kconfig | 1 drivers/usb/core/hcd.c | 19 + drivers/usb/core/hub.c | 10 + drivers/usb/core/phy.c | 93 ++++-- drivers/usb/core/phy.h | 22 + drivers/usb/core/quirks.c | 3 drivers/usb/host/xhci-dbgtty.c | 8 drivers/usb/host/xhci-pci.c | 5 drivers/usb/host/xhci-plat.c | 32 +- drivers/usb/host/xhci.h | 3 drivers/usb/musb/musb_dsps.c | 2 drivers/usb/musb/musb_host.c | 1 drivers/usb/serial/Kconfig | 1 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ftdi_sio.c | 3 drivers/usb/serial/usb-serial-simple.c | 7 drivers/usb/typec/ucsi/Makefile | 2 drivers/usb/typec/ucsi/ucsi.c | 2 drivers/usb/usbip/stub_main.c | 5 drivers/usb/usbip/usbip_common.h | 2 drivers/usb/usbip/usbip_event.c | 4 drivers/usb/usbip/vhci_hcd.c | 13 + drivers/virt/vboxguest/vboxguest_core.c | 70 ++-- drivers/virt/vboxguest/vboxguest_core.h | 9 + drivers/virt/vboxguest/vboxguest_linux.c | 19 + drivers/virt/vboxguest/vboxguest_utils.c | 17 + fs/ceph/xattr.c | 28 ++ fs/cifs/cifssmb.c | 3 fs/cifs/connect.c | 32 +- fs/cifs/smb2ops.c | 18 + fs/cifs/smb2pdu.c | 13 - fs/cifs/smb2pdu.h | 2 fs/cifs/smbdirect.c | 36 +- fs/cifs/transport.c | 9 - fs/ext4/balloc.c | 9 - fs/ext4/extents.c | 16 + fs/ext4/super.c | 1 fs/jbd2/transaction.c | 1 include/asm-generic/vmlinux.lds.h | 2 include/kvm/arm_psci.h | 16 + include/linux/blk-mq.h | 3 include/linux/blkdev.h | 6 include/linux/bpf.h | 4 include/linux/device.h | 6 include/linux/ethtool.h | 2 include/linux/fsnotify_backend.h | 4 include/linux/hrtimer.h | 2 include/linux/mtd/flashchip.h | 1 include/linux/serial_core.h | 21 + include/linux/stringhash.h | 4 include/linux/ti-emif-sram.h | 75 +++++ include/linux/timekeeper_internal.h | 2 include/linux/timekeeping.h | 37 ++ include/linux/tty.h | 2 include/linux/vbox_utils.h | 23 - include/linux/virtio.h | 3 include/net/ife.h | 3 include/net/llc_conn.h | 1 include/scsi/scsi_dbg.h | 2 include/soc/bcm2835/raspberrypi-firmware.h | 4 include/sound/control.h | 7 include/trace/events/ufs.h | 27 ++ include/trace/events/workqueue.h | 2 include/uapi/linux/kvm.h | 7 include/uapi/linux/sysctl.h | 18 - include/uapi/linux/time.h | 1 include/uapi/linux/virtio_balloon.h | 15 + kernel/bpf/core.c | 45 ++- kernel/bpf/sockmap.c | 3 kernel/kprobes.c | 2 kernel/module.c | 3 kernel/sysctl_binary.c | 20 - kernel/time/hrtimer.c | 16 + kernel/time/posix-stubs.c | 2 kernel/time/posix-timers.c | 26 +- kernel/time/tick-common.c | 15 - kernel/time/tick-internal.h | 6 kernel/time/tick-sched.c | 19 - kernel/time/timekeeping.c | 78 ++--- kernel/time/timekeeping.h | 1 kernel/trace/bpf_trace.c | 25 +- kernel/trace/trace.c | 2 kernel/trace/trace_entries.h | 2 kernel/trace/trace_events_filter.c | 14 - lib/dma-direct.c | 3 lib/kobject.c | 11 - mm/mmap.c | 11 + net/bridge/netfilter/ebtables.c | 11 - net/ceph/messenger.c | 7 net/ceph/mon_client.c | 14 + net/ife/ife.c | 38 ++ net/ipv4/tcp_input.c | 7 net/ipv6/netfilter/Kconfig | 55 ++- net/ipv6/route.c | 2 net/ipv6/seg6_iptunnel.c | 2 net/l2tp/l2tp_debugfs.c | 5 net/l2tp/l2tp_ppp.c | 12 + net/llc/af_llc.c | 21 + net/llc/llc_c_ac.c | 9 - net/llc/llc_conn.c | 22 + net/netfilter/Kconfig | 1 net/netfilter/ipvs/ip_vs_ctl.c | 8 net/netfilter/ipvs/ip_vs_sync.c | 155 +++++----- net/netfilter/nf_conntrack_expect.c | 5 net/netfilter/nf_conntrack_extend.c | 2 net/netfilter/nf_conntrack_sip.c | 16 + net/netfilter/nf_tables_api.c | 69 ++-- net/netfilter/xt_connmark.c | 49 ++- net/packet/af_packet.c | 60 +++- net/packet/internal.h | 10 - net/sched/act_ife.c | 9 - net/strparser/strparser.c | 2 security/commoncap.c | 2 sound/core/control.c | 2 sound/core/pcm_compat.c | 7 sound/core/pcm_native.c | 30 +- sound/core/seq/oss/seq_oss_event.c | 15 + sound/core/seq/oss/seq_oss_midi.c | 2 sound/core/seq/oss/seq_oss_synth.c | 85 +++-- sound/core/seq/oss/seq_oss_synth.h | 3 sound/drivers/opl3/opl3_synth.c | 7 sound/firewire/dice/dice-stream.c | 2 sound/firewire/dice/dice.c | 2 sound/pci/asihpi/hpimsginit.c | 13 + sound/pci/asihpi/hpioctl.c | 4 sound/pci/hda/hda_hwdep.c | 12 + sound/pci/hda/patch_hdmi.c | 9 - sound/pci/hda/patch_realtek.c | 5 sound/pci/rme9652/hdspm.c | 24 + sound/pci/rme9652/rme9652.c | 6 sound/soc/amd/acp-da7219-max98357a.c | 2 sound/soc/codecs/adau17x1.c | 26 +- sound/soc/codecs/adau17x1.h | 3 sound/soc/codecs/msm8916-wcd-analog.c | 9 - sound/soc/codecs/rt5514.c | 3 sound/soc/fsl/fsl_esai.c | 7 sound/soc/fsl/fsl_ssi.c | 14 + sound/soc/intel/Kconfig | 22 + sound/soc/omap/omap-dmic.c | 14 + sound/soc/sh/rcar/core.c | 4 sound/soc/soc-topology.c | 14 + sound/usb/mixer.c | 7 sound/usb/mixer_maps.c | 3 sound/usb/stream.c | 2 sound/usb/usx2y/us122l.c | 2 sound/usb/usx2y/usX2Yhwdep.c | 2 sound/usb/usx2y/usx2yhwdeppcm.c | 2 tools/perf/Documentation/perf-mem.txt | 41 ++- tools/perf/arch/s390/util/auxtrace.c | 1 tools/perf/arch/s390/util/header.c | 18 - tools/perf/builtin-stat.c | 40 ++ tools/perf/pmu-events/arch/s390/mapfile.csv | 10 - tools/perf/tests/attr/test-record-group-sampling | 3 .../tests/shell/record+probe_libc_inet_pton.sh | 6 tools/perf/util/evsel.c | 18 + tools/perf/util/evsel.h | 1 tools/perf/util/machine.c | 30 +- tools/perf/util/parse-events.y | 8 tools/perf/util/pmu.c | 22 - tools/testing/selftests/bpf/.gitignore | 3 tools/testing/selftests/bpf/test_sock.c | 1 tools/testing/selftests/bpf/test_sock_addr.c | 1 tools/testing/selftests/bpf/test_sock_addr.sh | 4 tools/testing/selftests/firmware/Makefile | 1 tools/testing/selftests/firmware/fw_lib.sh | 10 - tools/testing/selftests/firmware/fw_run_tests.sh | 2 .../inter-event/trigger-extended-error-support.tc | 2 .../inter-event/trigger-multi-actions-accept.tc | 44 +++ tools/testing/selftests/x86/test_syscall_vdso.c | 35 +- virt/kvm/arm/arm.c | 15 + virt/kvm/arm/psci.c | 60 ++++ virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 virt/kvm/arm/vgic/vgic.c | 22 + 396 files changed, 4218 insertions(+), 2418 deletions(-)