Merge tag 'v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992800AbdFFPuQKhSf3/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jun 6 11:47:03 2017 +0200 Commit: 7339dd4127d0381e464dd5113ada7e52cae0346c Gitweb: https://git.linux-mips.org/g/ralf/linux/7339dd4127d0 Branch: master --- .../devicetree/bindings/staging/ion/hi6220-ion.txt | 31 ----- Documentation/usb/typec.rst | 6 - Documentation/watchdog/watchdog-parameters.txt | 2 MAINTAINERS | 15 ++- Makefile | 4 - arch/alpha/kernel/osf_sys.c | 6 + arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 2 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 2 arch/arm/boot/dts/bcm283x.dtsi | 22 ++-- arch/arm/boot/dts/dra7-evm.dts | 2 arch/arm/boot/dts/dra7.dtsi | 4 + arch/arm/boot/dts/imx53-qsrb.dts | 2 arch/arm/boot/dts/imx6sx-sdb.dts | 17 --- arch/arm/boot/dts/include/arm | 1 arch/arm/boot/dts/include/arm64 | 1 arch/arm/boot/dts/include/dt-bindings | 1 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 6 + arch/arm/boot/dts/mt7623.dtsi | 2 arch/arm/boot/dts/omap3-gta04.dtsi | 3 - arch/arm/boot/dts/omap4-panda-a4.dts | 2 arch/arm/boot/dts/omap4-panda-es.dts | 2 arch/arm/configs/gemini_defconfig | 68 ++++++++++++ arch/arm/include/asm/kvm_coproc.h | 3 - arch/arm/kvm/coproc.c | 106 +++++++++++++----- arch/arm/kvm/handle_exit.c | 4 - arch/arm/kvm/hyp/Makefile | 2 arch/arm/kvm/hyp/switch.c | 4 + arch/arm/kvm/trace.h | 8 + arch/arm/mach-at91/pm.c | 2 arch/arm/mach-bcm/bcm_kona_smc.c | 2 arch/arm/mach-cns3xxx/core.c | 2 arch/arm/mach-omap2/common.h | 3 - arch/arm/mach-omap2/omap-mpuss-lowpower.c | 10 +- arch/arm/mach-omap2/omap-smp.c | 11 +- arch/arm/mach-omap2/prm_common.c | 2 arch/arm/mach-omap2/vc.c | 2 arch/arm/mach-spear/time.c | 2 arch/arm64/Kconfig.platforms | 5 + arch/arm64/boot/dts/include/arm | 1 arch/arm64/boot/dts/include/arm64 | 1 arch/arm64/boot/dts/include/dt-bindings | 1 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 8 + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 73 ++++++++++++ arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 arch/arm64/configs/defconfig | 106 ++++++++---------- arch/arm64/include/asm/atomic_ll_sc.h | 1 arch/arm64/include/asm/cpufeature.h | 12 ++ arch/arm64/include/asm/kvm_host.h | 8 + arch/arm64/kernel/cpufeature.c | 23 ++++ arch/arm64/kernel/perf_event.c | 23 +++- arch/arm64/kvm/hyp/Makefile | 2 arch/cris/boot/dts/include/dt-bindings | 1 arch/metag/boot/dts/include/dt-bindings | 1 arch/mips/boot/dts/include/dt-bindings | 1 arch/powerpc/boot/dts/include/dt-bindings | 1 arch/powerpc/include/asm/module.h | 4 + arch/powerpc/include/asm/page.h | 12 ++ arch/powerpc/kernel/idle_book3s.S | 2 arch/powerpc/kernel/kprobes.c | 3 - arch/powerpc/kernel/process.c | 19 +++ arch/powerpc/kvm/Kconfig | 2 arch/powerpc/kvm/Makefile | 4 - arch/powerpc/kvm/book3s_64_vio_hv.c | 13 ++ arch/powerpc/kvm/book3s_hv_builtin.c | 9 +- arch/powerpc/kvm/book3s_pr_papr.c | 70 +++++++++--- arch/powerpc/kvm/powerpc.c | 4 + arch/powerpc/mm/dump_linuxpagetables.c | 7 + arch/sparc/include/asm/hugetlb.h | 6 + arch/sparc/include/asm/pgtable_32.h | 4 - arch/sparc/include/asm/setup.h | 2 arch/sparc/kernel/ftrace.c | 13 +- arch/sparc/mm/init_32.c | 2 arch/x86/include/asm/kvm_host.h | 2 arch/x86/include/asm/uaccess.h | 11 +- arch/x86/kernel/fpu/init.c | 1 arch/x86/kvm/emulate.c | 2 arch/x86/kvm/paging_tmpl.h | 35 ++++-- arch/x86/kvm/pmu_intel.c | 2 arch/x86/kvm/svm.c | 3 - arch/x86/kvm/vmx.c | 4 - arch/x86/kvm/x86.c | 45 ++++++-- arch/x86/xen/enlighten_pv.c | 15 +-- arch/x86/xen/mmu.c | 2 arch/x86/xen/mmu_pv.c | 102 ++++++----------- drivers/block/drbd/drbd_req.c | 27 +++-- drivers/block/xen-blkback/xenbus.c | 8 + drivers/char/lp.c | 6 + drivers/char/mem.c | 5 + drivers/dax/super.c | 2 drivers/firmware/google/vpd.c | 21 +++- drivers/firmware/ti_sci.c | 3 - drivers/gpu/drm/arm/hdlcd_crtc.c | 47 +++++--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 36 ++---- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 + drivers/gpu/drm/i915/gvt/handlers.c | 2 drivers/gpu/drm/i915/gvt/render.c | 3 + drivers/gpu/drm/i915/gvt/sched_policy.c | 8 + drivers/gpu/drm/i915/i915_gem_gtt.c | 12 +- drivers/gpu/drm/i915/i915_reg.h | 10 +- drivers/gpu/drm/i915/intel_cdclk.c | 6 - drivers/gpu/drm/i915/intel_dsi.c | 7 + drivers/gpu/drm/i915/intel_lpe_audio.c | 5 + drivers/gpu/drm/nouveau/nouveau_display.c | 6 - drivers/gpu/drm/nouveau/nouveau_drm.c | 6 + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 3 - .../drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c | 4 + drivers/gpu/host1x/Kconfig | 1 drivers/hwmon/coretemp.c | 14 ++ drivers/i2c/busses/i2c-designware-platdrv.c | 18 ++- drivers/i2c/busses/i2c-mv64xxx.c | 6 + drivers/i2c/busses/i2c-xgene-slimpro.c | 1 drivers/i2c/i2c-mux.c | 26 +++- drivers/i2c/muxes/i2c-mux-reg.c | 21 ++-- drivers/iommu/dma-iommu.c | 13 +- drivers/iommu/intel-iommu.c | 5 + drivers/iommu/mtk_iommu_v1.c | 1 drivers/irqchip/irq-mbigen.c | 17 ++- drivers/md/dm-bufio.c | 16 +-- drivers/md/dm-cache-background-tracker.c | 5 + drivers/md/dm-cache-policy-smq.c | 31 ++--- drivers/md/dm-cache-target.c | 27 ++--- drivers/md/dm-mpath.c | 19 ++- drivers/md/dm-rq.c | 1 drivers/md/dm-thin-metadata.c | 4 - drivers/md/md.c | 20 +-- drivers/md/md.h | 2 drivers/md/persistent-data/dm-space-map-disk.c | 15 ++- drivers/md/raid0.c | 116 +++++++++++++++++--- drivers/md/raid1.c | 21 ++-- drivers/md/raid10.c | 7 + drivers/md/raid5-cache.c | 47 ++++++-- drivers/md/raid5-log.h | 3 - drivers/md/raid5.c | 79 ++++++++----- drivers/memory/omap-gpmc.c | 2 drivers/misc/Kconfig | 1 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 - drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 6 + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 6 + drivers/net/ethernet/faraday/ftmac100.c | 7 + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 3 - .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 - drivers/net/ethernet/renesas/sh_eth.c | 3 - drivers/net/usb/qmi_wwan.c | 2 drivers/nvme/host/fc.c | 10 ++ drivers/nvme/host/pci.c | 7 + drivers/nvme/target/core.c | 6 + drivers/nvme/target/fc.c | 4 - drivers/nvme/target/fcloop.c | 1 drivers/nvme/target/nvmet.h | 1 drivers/nvme/target/rdma.c | 1 drivers/of/fdt.c | 3 + drivers/of/of_reserved_mem.c | 2 drivers/scsi/cxlflash/Kconfig | 1 drivers/scsi/libfc/fc_fcp.c | 15 ++- drivers/scsi/lpfc/lpfc_crtn.h | 1 drivers/scsi/lpfc/lpfc_ct.c | 2 drivers/scsi/lpfc/lpfc_init.c | 9 +- drivers/scsi/lpfc/lpfc_nvmet.c | 1 drivers/scsi/lpfc/lpfc_sli.c | 19 ++- drivers/scsi/pmcraid.c | 3 - drivers/scsi/qedf/qedf.h | 2 drivers/scsi/qedf/qedf_els.c | 2 drivers/scsi/qedf/qedf_main.c | 2 drivers/scsi/scsi.c | 2 drivers/scsi/scsi_lib.c | 1 drivers/soc/bcm/brcmstb/common.c | 2 drivers/soc/imx/Kconfig | 3 - drivers/staging/android/ion/devicetree.txt | 51 --------- drivers/staging/ccree/ssi_request_mgr.c | 1 drivers/staging/fsl-dpaa2/Kconfig | 1 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 24 +++- drivers/staging/rtl8192e/rtl819x_TSProc.c | 15 +-- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 1 drivers/staging/typec/fusb302/fusb302.c | 86 ++++++++------- drivers/staging/typec/pd.h | 10 ++ drivers/staging/typec/pd_vdo.h | 4 + drivers/staging/typec/tcpci.c | 2 drivers/staging/typec/tcpm.c | 77 ++++++++++++- drivers/staging/typec/tcpm.h | 3 + .../interface/vchiq_arm/vchiq_2835_arm.c | 31 +++-- drivers/tee/Kconfig | 1 drivers/uio/uio.c | 8 + drivers/usb/core/devio.c | 14 +- drivers/usb/core/hcd.c | 5 + drivers/usb/core/hub.c | 27 ++++- drivers/usb/core/of.c | 3 + drivers/usb/core/urb.c | 2 drivers/usb/dwc3/dwc3-keystone.c | 4 + drivers/usb/dwc3/dwc3-pci.c | 4 + drivers/usb/dwc3/gadget.c | 21 +++- drivers/usb/gadget/function/f_fs.c | 10 +- drivers/usb/gadget/function/u_serial.c | 2 drivers/usb/gadget/udc/dummy_hcd.c | 6 + drivers/usb/host/ehci-platform.c | 4 + drivers/usb/host/r8a66597-hcd.c | 6 + drivers/usb/host/xhci-hub.c | 2 drivers/usb/host/xhci-mem.c | 11 +- drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-plat.c | 2 drivers/usb/host/xhci-ring.c | 20 ++- drivers/usb/host/xhci.c | 13 +- drivers/usb/misc/chaoskey.c | 2 drivers/usb/misc/iowarrior.c | 2 drivers/usb/misc/legousbtower.c | 1 drivers/usb/misc/sisusbvga/sisusb_con.c | 2 drivers/usb/musb/musb_host.c | 9 +- drivers/usb/musb/tusb6010_omap.c | 13 ++ drivers/usb/serial/ftdi_sio.c | 10 +- drivers/usb/serial/ftdi_sio_ids.h | 2 drivers/usb/serial/io_ti.c | 5 + drivers/usb/serial/ir-usb.c | 21 ++-- drivers/usb/serial/mct_u232.c | 2 drivers/usb/serial/option.c | 8 + drivers/usb/serial/qcserial.c | 2 drivers/usb/storage/ene_ub6250.c | 90 +++++++++------ drivers/usb/usbip/vhci_hcd.c | 11 +- drivers/uwb/i1480/dfu/usb.c | 5 + drivers/watchdog/Kconfig | 2 drivers/watchdog/bcm_kona_wdt.c | 3 - drivers/watchdog/cadence_wdt.c | 2 drivers/watchdog/iTCO_wdt.c | 22 ++-- drivers/watchdog/pcwd_usb.c | 3 + drivers/watchdog/sama5d4_wdt.c | 77 ++++++++++--- drivers/watchdog/wdt_pci.c | 2 drivers/watchdog/zx2967_wdt.c | 4 - fs/ext2/inode.c | 4 - fs/ext4/inode.c | 4 - fs/fuse/inode.c | 9 +- fs/xfs/xfs_iomap.c | 4 - include/kvm/arm_vgic.h | 5 + include/linux/dax.h | 34 +++++- include/linux/kprobes.h | 3 + include/linux/nvme-fc-driver.h | 16 +-- include/linux/of_irq.h | 2 include/linux/soc/renesas/rcar-rst.h | 5 + include/linux/usb/hcd.h | 1 include/net/x25.h | 4 - include/uapi/linux/usb/ch11.h | 3 + kernel/bpf/verifier.c | 12 ++ kernel/fork.c | 8 + kernel/irq/chip.c | 2 kernel/kprobes.c | 8 + kernel/pid_namespace.c | 2 kernel/sched/core.c | 25 ++++ kernel/sched/idle.c | 2 kernel/sched/sched.h | 2 kernel/trace/blktrace.c | 4 - kernel/trace/ftrace.c | 12 ++ kernel/trace/trace.c | 34 +++++- kernel/trace/trace.h | 5 + kernel/trace/trace_kprobe.c | 5 + net/9p/trans_xen.c | 8 + net/bridge/br_netlink.c | 7 + net/core/neighbour.c | 14 ++ net/core/rtnetlink.c | 36 ++++-- net/core/sock.c | 3 - net/ipv4/arp.c | 16 ++- net/ipv4/fib_frontend.c | 15 ++- net/ipv4/fib_trie.c | 26 ++-- net/ipv4/ipmr.c | 18 +++ net/ipv4/tcp_input.c | 2 net/ipv4/udp.c | 4 - net/ipv4/udp_impl.h | 1 net/ipv6/ip6_offload.c | 7 + net/ipv6/ip6_output.c | 5 + net/ipv6/output_core.c | 14 +- net/ipv6/udp.c | 4 - net/ipv6/udp_impl.h | 1 net/ipv6/udp_offload.c | 6 + net/sctp/ipv6.c | 3 + net/smc/Kconfig | 4 + net/smc/smc_clc.c | 4 - net/smc/smc_core.c | 16 +-- net/smc/smc_core.h | 2 net/smc/smc_ib.c | 21 ---- net/smc/smc_ib.h | 2 net/x25/af_x25.c | 24 +++- net/x25/sysctl_net_x25.c | 5 + scripts/Makefile.headersinst | 43 +++++-- scripts/Makefile.lib | 2 scripts/dtc/checks.c | 2 scripts/dtc/include-prefixes/arc | 1 scripts/dtc/include-prefixes/arm | 1 scripts/dtc/include-prefixes/arm64 | 1 scripts/dtc/include-prefixes/c6x | 1 scripts/dtc/include-prefixes/cris | 1 scripts/dtc/include-prefixes/dt-bindings | 1 scripts/dtc/include-prefixes/h8300 | 1 scripts/dtc/include-prefixes/metag | 1 scripts/dtc/include-prefixes/microblaze | 1 scripts/dtc/include-prefixes/mips | 1 scripts/dtc/include-prefixes/nios2 | 1 scripts/dtc/include-prefixes/openrisc | 1 scripts/dtc/include-prefixes/powerpc | 1 scripts/dtc/include-prefixes/sh | 1 scripts/dtc/include-prefixes/xtensa | 1 sound/x86/intel_hdmi_audio.c | 4 - .../selftests/bpf/include/uapi/linux/types.h | 16 +++ tools/testing/selftests/bpf/test_pkt_access.c | 1 tools/testing/selftests/ftrace/ftracetest | 2 .../ftrace/test.d/ftrace/func_event_triggers.tc | 2 tools/testing/selftests/ftrace/test.d/functions | 4 - .../ftrace/test.d/instances/instance-event.tc | 8 + tools/testing/selftests/powerpc/tm/.gitignore | 1 tools/testing/selftests/powerpc/tm/Makefile | 4 + .../testing/selftests/powerpc/tm/tm-vmx-unavail.c | 118 ++++++++++++++++++++ virt/kvm/arm/hyp/vgic-v3-sr.c | 18 ++- virt/kvm/arm/mmu.c | 33 ++++-- virt/kvm/arm/vgic/vgic-init.c | 5 + virt/kvm/arm/vgic/vgic-mmio-v3.c | 12 ++ virt/kvm/arm/vgic/vgic-v2.c | 7 + virt/kvm/arm/vgic/vgic-v3.c | 7 + 315 files changed, 2322 insertions(+), 1191 deletions(-)