Merge tag 'v4.14.60' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.14-stable
[email protected] Fri, 31 Aug 2018 03:24:44 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994637AbeHaBYqzRF2I/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 02:16:28 2018 +0200 Commit: d5095d00f702b9ef209234fae4f791d48ccff789 Gitweb: https://git.linux-mips.org/g/ralf/linux/d5095d00f702 Branch: linux-4.14-stable --- .../devicetree/bindings/net/dsa/qca8k.txt | 23 ++++ .../devicetree/bindings/net/meson-dwmac.txt | 1 .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 Documentation/vfio-mediated-device.txt | 5 + Makefile | 2 arch/arm/boot/dts/emev2.dtsi | 5 + arch/arm/boot/dts/sh73a0.dtsi | 5 + arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +- arch/arm/net/bpf_jit_32.c | 10 +- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 38 ++++--- arch/arm64/configs/defconfig | 2 arch/arm64/include/asm/cmpxchg.h | 4 + arch/arm64/mm/init.c | 4 + arch/microblaze/boot/Makefile | 10 +- arch/powerpc/include/asm/barrier.h | 15 +++ arch/powerpc/include/asm/cache.h | 3 + arch/powerpc/kernel/eeh_driver.c | 28 +++-- arch/powerpc/kernel/head_8xx.S | 2 arch/powerpc/kernel/pci_32.c | 1 arch/powerpc/kernel/prom_init.c | 114 ++++++++++---------- arch/powerpc/lib/string.S | 7 + arch/powerpc/mm/slb.c | 8 + arch/powerpc/net/bpf_jit_comp64.c | 34 ++++-- arch/powerpc/platforms/chrp/time.c | 6 + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 5 + arch/powerpc/platforms/powermac/bootx_init.c | 4 + arch/powerpc/platforms/powermac/setup.c | 1 arch/s390/include/asm/cpu_mf.h | 6 + arch/x86/events/intel/uncore.c | 2 arch/x86/events/intel/uncore_nhmex.c | 2 arch/x86/kernel/cpu/microcode/core.c | 6 + arch/x86/kvm/mmu.c | 2 block/bfq-iosched.c | 2 block/bio.c | 19 ++- crypto/authenc.c | 1 crypto/authencesn.c | 1 drivers/acpi/acpi_lpss.c | 6 + drivers/acpi/pci_root.c | 4 + drivers/ata/libata-eh.c | 12 +- drivers/bluetooth/btusb.c | 4 + drivers/bluetooth/hci_qca.c | 2 drivers/bus/arm-ccn.c | 20 ++-- drivers/char/random.c | 10 ++ drivers/edac/altera_edac.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 + drivers/gpu/drm/drm_atomic.c | 4 + drivers/gpu/drm/drm_atomic_helper.c | 78 +++++++------- drivers/gpu/drm/drm_dp_mst_topology.c | 9 +- drivers/gpu/drm/gma500/psb_intel_drv.h | 2 drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 8 + drivers/gpu/drm/radeon/radeon_connectors.c | 10 +- drivers/hid/hid-plantronics.c | 6 + drivers/hid/i2c-hid/i2c-hid.c | 8 + drivers/i2c/i2c-core-base.c | 5 + drivers/infiniband/core/mad.c | 11 +- drivers/infiniband/core/ucma.c | 6 + drivers/infiniband/core/uverbs_cmd.c | 5 + drivers/infiniband/core/verbs.c | 12 ++ drivers/infiniband/ulp/srpt/ib_srpt.c | 16 ++- drivers/input/mouse/elan_i2c_core.c | 2 drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/irqchip/irq-ls-scfg-msi.c | 3 + drivers/lightnvm/pblk-rb.c | 5 - drivers/md/md.c | 3 + drivers/md/raid1.c | 2 drivers/media/common/siano/smsendian.c | 14 +- drivers/media/i2c/smiapp/smiapp-core.c | 11 +- drivers/media/media-device.c | 21 ++-- drivers/media/pci/saa7164/saa7164-fw.c | 3 - drivers/media/pci/tw686x/tw686x-video.c | 3 - drivers/media/platform/omap3isp/isp.c | 7 + drivers/media/platform/rcar_jpu.c | 4 + drivers/media/radio/si470x/radio-si470x-i2c.c | 6 + drivers/media/v4l2-core/videobuf2-core.c | 9 +- drivers/memory/tegra/mc.c | 22 +--- drivers/memory/tegra/mc.h | 9 ++ drivers/memory/tegra/tegra114.c | 2 drivers/memory/tegra/tegra124.c | 6 + drivers/memory/tegra/tegra210.c | 3 + drivers/memory/tegra/tegra30.c | 2 drivers/mfd/cros_ec.c | 6 + drivers/mmc/core/pwrseq_simple.c | 14 ++ drivers/mmc/host/dw_mmc.c | 4 + drivers/mtd/nand/fsl_ifc_nand.c | 17 ++- drivers/net/dsa/qca8k.c | 52 +++++++++ drivers/net/dsa/qca8k.h | 7 + drivers/net/ethernet/amazon/ena/ena_com.c | 1 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 + .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 4 + drivers/net/ethernet/intel/e1000e/netdev.c | 15 +-- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 7 + drivers/net/ethernet/intel/igb/igb_main.c | 9 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 drivers/net/ethernet/ti/cpsw-phy-sel.c | 8 + drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc_drv.c | 43 ++++---- drivers/net/phy/mdio-mux-bcm-iproc.c | 2 drivers/net/phy/phylink.c | 2 drivers/net/usb/lan78xx.c | 2 drivers/net/wireless/ath/regd.h | 5 + drivers/net/wireless/ath/regd_common.h | 13 ++ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 drivers/net/wireless/marvell/mwifiex/usb.c | 3 + drivers/net/wireless/marvell/mwifiex/util.c | 8 + drivers/net/wireless/rsi/rsi_91x_hal.c | 35 ++++-- drivers/net/wireless/rsi/rsi_91x_sdio.c | 23 ++-- drivers/net/wireless/rsi/rsi_sdio.h | 2 drivers/net/wireless/ti/wlcore/sdio.c | 5 + drivers/net/xen-netfront.c | 10 +- drivers/nvme/host/pci.c | 5 + drivers/nvme/host/rdma.c | 10 +- drivers/nvmem/core.c | 7 + drivers/pci/host/pci-xgene.c | 1 drivers/pci/hotplug/pciehp_hpc.c | 7 + drivers/pci/pci-sysfs.c | 15 ++- drivers/pci/probe.c | 4 + drivers/pinctrl/pinctrl-at91-pio4.c | 4 + drivers/regulator/cpcap-regulator.c | 2 drivers/regulator/of_regulator.c | 13 +- drivers/regulator/pfuze100-regulator.c | 1 drivers/regulator/twl-regulator.c | 2 drivers/rtc/interface.c | 5 + drivers/rtc/rtc-tps6586x.c | 14 ++ drivers/rtc/rtc-tps65910.c | 12 +- drivers/rtc/rtc-vr41xx.c | 9 +- drivers/s390/scsi/zfcp_dbf.c | 2 drivers/scsi/3w-9xxx.c | 5 + drivers/scsi/3w-xxxx.c | 3 + drivers/scsi/cxlflash/main.c | 11 +- drivers/scsi/cxlflash/sislite.h | 1 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 11 +- drivers/scsi/megaraid.c | 3 + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 + drivers/scsi/qedf/qedf_main.c | 10 ++ drivers/scsi/scsi_dh.c | 5 + drivers/scsi/ufs/ufshcd.c | 28 ++++- drivers/soc/imx/gpcv2.c | 22 +++- drivers/spi/spi-meson-spicc.c | 11 +- drivers/spi/spi-s3c64xx.c | 4 - drivers/spi/spi-sh-msiof.c | 6 + drivers/spi/spi.c | 1 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 30 +++-- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 6 + drivers/staging/lustre/lustre/llite/xattr.c | 6 + drivers/staging/media/atomisp/i2c/ov2680.c | 6 + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 49 +++++---- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 1 drivers/thermal/samsung/exynos_tmu.c | 1 drivers/tty/hvc/hvc_opal.c | 1 drivers/tty/pty.c | 3 + drivers/usb/core/hub.c | 4 + drivers/usb/gadget/udc/renesas_usb3.c | 8 + drivers/vfio/mdev/mdev_core.c | 102 ++++++------------ drivers/vfio/mdev/mdev_private.h | 2 drivers/vfio/platform/vfio_platform_common.c | 15 ++- drivers/vfio/vfio_iommu_type1.c | 73 ++++++++----- drivers/video/backlight/pwm_bl.c | 6 + drivers/watchdog/da9063_wdt.c | 17 +++ fs/block_dev.c | 9 +- fs/btrfs/inode.c | 33 ++++-- fs/btrfs/qgroup.c | 19 +++ fs/btrfs/tree-log.c | 10 +- fs/ceph/super.c | 2 fs/crypto/crypto.c | 11 ++ fs/ext4/balloc.c | 3 + fs/ext4/ialloc.c | 8 + fs/ext4/inline.c | 19 ++- fs/ext4/inode.c | 16 +-- fs/ext4/super.c | 8 - fs/f2fs/data.c | 8 + fs/f2fs/file.c | 18 ++- fs/f2fs/gc.c | 11 +- fs/f2fs/segment.c | 5 + fs/f2fs/super.c | 6 + fs/nfs/nfs4proc.c | 14 ++ fs/nfs/pnfs.c | 6 + fs/nfsd/nfs4xdr.c | 2 fs/overlayfs/super.c | 19 +++ fs/proc/task_mmu.c | 26 +++-- fs/squashfs/cache.c | 3 + fs/squashfs/file.c | 8 + fs/squashfs/fragment.c | 4 - fs/squashfs/squashfs_fs.h | 6 + include/drm/drm_dp_helper.h | 1 include/linux/delayacct.h | 4 - include/linux/dma-iommu.h | 1 include/linux/mmc/sdio_ids.h | 1 include/linux/netfilter/ipset/ip_set_timeout.h | 10 +- include/linux/regulator/consumer.h | 1 include/linux/serial_core.h | 3 - include/linux/thread_info.h | 6 - include/net/tcp.h | 2 include/soc/tegra/mc.h | 2 include/uapi/sound/asoc.h | 23 ++++ kernel/auditfilter.c | 2 kernel/auditsc.c | 2 kernel/bpf/verifier.c | 4 - kernel/delayacct.c | 17 ++- kernel/fork.c | 3 - kernel/hung_task.c | 11 +- kernel/kcov.c | 3 - kernel/kthread.c | 8 + kernel/power/suspend.c | 14 +- kernel/printk/printk_safe.c | 2 kernel/stop_machine.c | 24 ++-- kernel/trace/trace_events_trigger.c | 18 ++- kernel/trace/trace_kprobe.c | 15 ++- mm/slub.c | 2 mm/vmalloc.c | 3 - net/ipv4/fib_frontend.c | 4 - net/ipv4/ipconfig.c | 13 ++ net/ipv4/tcp_bbr.c | 4 + net/ipv4/tcp_dctcp.c | 4 - net/ipv4/tcp_input.c | 48 ++++---- net/netfilter/ipset/ip_set_hash_gen.h | 5 + net/netfilter/nf_tables_api.c | 11 +- net/netlink/af_netlink.c | 5 + security/integrity/ima/ima_main.c | 1 sound/pci/emu10k1/emupcm.c | 4 + sound/pci/emu10k1/memory.c | 6 + sound/pci/fm801.c | 16 ++- sound/pci/hda/patch_ca0132.c | 8 + sound/soc/soc-pcm.c | 6 + sound/soc/soc-topology.c | 19 ++- sound/usb/pcm.c | 2 tools/perf/util/parse-events.y | 14 ++ tools/testing/selftests/intel_pstate/run.sh | 29 ++--- tools/testing/selftests/memfd/run_tests.sh | 14 ++ tools/usb/usbip/libsrc/vhci_driver.c | 32 +++--- tools/usb/usbip/libsrc/vhci_driver.h | 3 - tools/usb/usbip/src/usbip_detach.c | 9 +- 238 files changed, 1564 insertions(+), 825 deletions(-)