Merge tag 'v4.15-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 02 Feb 2018 13:21:45 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994885AbeBBMVsAoN6P/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Feb 2 12:48:42 2018 +0100 Commit: 6db706afdf913ab9d762d7777ef1eb7079f89e01 Gitweb: https://git.linux-mips.org/g/ralf/linux/6db706afdf91 Branch: master --- Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + Documentation/admin-guide/kernel-parameters.txt | 58 ++ Documentation/filesystems/nilfs2.txt | 4 Documentation/kbuild/kconfig-language.txt | 23 + Documentation/networking/index.rst | 2 Documentation/networking/msg_zerocopy.rst | 4 Documentation/usb/gadget-testing.txt | 2 Documentation/virtual/kvm/api.txt | 46 ++ Documentation/x86/pti.txt | 186 +++++++ MAINTAINERS | 5 Makefile | 45 +- arch/alpha/kernel/sys_sio.c | 35 + arch/alpha/lib/ev6-memset.S | 12 arch/arm/boot/dts/da850-lcdk.dts | 4 arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 arch/arm/boot/dts/sun4i-a10.dtsi | 2 arch/arm/boot/dts/sun7i-a20.dtsi | 2 arch/arm/configs/sunxi_defconfig | 2 arch/arm/net/bpf_jit_32.c | 225 ++++----- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 1 .../boot/dts/marvell/armada-cp110-master.dtsi | 13 - .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 9 arch/arm64/kvm/handle_exit.c | 4 arch/arm64/net/bpf_jit_comp.c | 20 - arch/ia64/include/asm/atomic.h | 37 + arch/ia64/kernel/time.c | 2 arch/mips/Kconfig | 12 arch/mips/Kconfig.debug | 14 - arch/mips/ar7/platform.c | 2 arch/mips/ath25/devices.c | 2 arch/mips/kernel/mips-cm.c | 1 arch/mips/lib/Makefile | 3 arch/mips/lib/libgcc.h | 17 + arch/mips/lib/multi3.c | 54 ++ arch/mips/mm/uasm-micromips.c | 2 arch/mips/ralink/timer.c | 4 arch/mips/rb532/Makefile | 4 arch/mips/rb532/devices.c | 4 arch/powerpc/Kconfig | 1 arch/powerpc/include/asm/exception-64e.h | 6 arch/powerpc/include/asm/exception-64s.h | 57 ++ arch/powerpc/include/asm/feature-fixups.h | 13 + arch/powerpc/include/asm/hvcall.h | 18 + arch/powerpc/include/asm/paca.h | 10 arch/powerpc/include/asm/plpar_wrappers.h | 14 + arch/powerpc/include/asm/setup.h | 13 + arch/powerpc/include/uapi/asm/kvm.h | 25 + arch/powerpc/kernel/asm-offsets.c | 5 arch/powerpc/kernel/entry_64.S | 44 +- arch/powerpc/kernel/exceptions-64s.S | 137 +++++ arch/powerpc/kernel/setup-common.c | 11 arch/powerpc/kernel/setup_64.c | 139 ++++++ arch/powerpc/kernel/vmlinux.lds.S | 9 arch/powerpc/kvm/book3s_64_mmu.c | 1 arch/powerpc/kvm/book3s_64_mmu_hv.c | 90 ++-- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 arch/powerpc/kvm/book3s_pr.c | 2 arch/powerpc/kvm/book3s_rmhandlers.S | 7 arch/powerpc/kvm/book3s_segment.S | 4 arch/powerpc/kvm/powerpc.c | 131 +++++ arch/powerpc/lib/feature-fixups.c | 41 ++ arch/powerpc/platforms/powernv/setup.c | 49 ++ arch/powerpc/platforms/pseries/dlpar.c | 21 + arch/powerpc/platforms/pseries/pseries.h | 2 arch/powerpc/platforms/pseries/ras.c | 3 arch/powerpc/platforms/pseries/setup.c | 35 + arch/powerpc/xmon/xmon.c | 26 + arch/s390/include/asm/kvm_host.h | 3 arch/s390/include/uapi/asm/kvm.h | 5 arch/s390/kvm/kvm-s390.c | 12 arch/s390/kvm/vsie.c | 10 arch/sh/boards/mach-se/770x/setup.c | 24 + arch/sh/include/mach-se/mach/se.h | 1 arch/x86/Kconfig | 15 + arch/x86/Makefile | 8 arch/x86/crypto/aesni-intel_asm.S | 5 arch/x86/crypto/camellia-aesni-avx-asm_64.S | 3 arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 3 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 3 arch/x86/entry/calling.h | 36 + arch/x86/entry/entry_32.S | 16 + arch/x86/entry/entry_64.S | 25 + arch/x86/events/intel/bts.c | 18 + arch/x86/events/intel/rapl.c | 4 arch/x86/include/asm/apic.h | 1 arch/x86/include/asm/asm-prototypes.h | 25 + arch/x86/include/asm/cpufeatures.h | 7 arch/x86/include/asm/mem_encrypt.h | 4 arch/x86/include/asm/mshyperv.h | 18 - arch/x86/include/asm/msr-index.h | 3 arch/x86/include/asm/nospec-branch.h | 222 +++++++++ arch/x86/include/asm/pci_x86.h | 1 arch/x86/include/asm/processor-flags.h | 2 arch/x86/include/asm/tlbflush.h | 6 arch/x86/include/asm/traps.h | 1 arch/x86/include/asm/xen/hypercall.h | 5 arch/x86/kernel/alternative.c | 7 arch/x86/kernel/apic/apic.c | 49 ++ arch/x86/kernel/apic/vector.c | 7 arch/x86/kernel/cpu/amd.c | 28 + arch/x86/kernel/cpu/bugs.c | 221 +++++++++ arch/x86/kernel/cpu/common.c | 3 arch/x86/kernel/cpu/intel_rdt.c | 8 arch/x86/kernel/cpu/mcheck/mce.c | 5 arch/x86/kernel/cpu/microcode/intel.c | 13 - arch/x86/kernel/cpu/scattered.c | 1 arch/x86/kernel/ftrace_32.S | 6 arch/x86/kernel/ftrace_64.S | 8 arch/x86/kernel/head64.c | 4 arch/x86/kernel/idt.c | 12 arch/x86/kernel/irq_32.c | 9 arch/x86/kernel/irqinit.c | 3 arch/x86/kernel/kprobes/opt.c | 23 + arch/x86/kernel/process.c | 25 + arch/x86/kernel/setup.c | 10 arch/x86/kernel/tboot.c | 11 arch/x86/kernel/tsc.c | 9 arch/x86/kernel/vmlinux.lds.S | 6 arch/x86/kvm/mmu.c | 19 - arch/x86/kvm/svm.c | 13 - arch/x86/kvm/vmx.c | 21 + arch/x86/kvm/x86.c | 4 arch/x86/lib/Makefile | 1 arch/x86/lib/checksum_32.S | 7 arch/x86/lib/retpoline.S | 49 ++ arch/x86/mm/fault.c | 7 arch/x86/mm/kasan_init_64.c | 24 + arch/x86/mm/mem_encrypt.c | 356 ++++++++++---- arch/x86/mm/mem_encrypt_boot.S | 80 ++- arch/x86/mm/pti.c | 32 - arch/x86/pci/common.c | 5 arch/x86/pci/fixup.c | 29 + arch/x86/platform/efi/efi_64.c | 2 .../platform/intel-mid/device_libs/platform_bt.c | 2 arch/x86/xen/mmu_pv.c | 8 arch/x86/xen/xen-ops.h | 2 crypto/algapi.c | 12 drivers/ata/libata-core.c | 1 drivers/base/Kconfig | 3 drivers/base/cpu.c | 48 ++ drivers/bcma/Kconfig | 2 drivers/block/rbd.c | 18 - drivers/gpio/gpio-mmio.c | 30 + drivers/gpio/gpiolib.c | 35 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 drivers/gpu/drm/i915/gvt/gtt.c | 5 drivers/gpu/drm/i915/i915_gem.c | 2 drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/i915/intel_display.c | 303 ++++++------ drivers/gpu/drm/i915/intel_drv.h | 2 drivers/gpu/drm/i915/intel_engine_cs.c | 5 drivers/gpu/drm/i915/intel_lrc.c | 3 drivers/gpu/drm/i915/intel_sprite.c | 83 +++ drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 1 drivers/gpu/drm/nouveau/nouveau_bo.c | 4 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 4 .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 1 drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 1 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 2 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c | 41 ++ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 10 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c | 45 ++ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 16 - drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 9 drivers/gpu/drm/tegra/sor.c | 3 drivers/gpu/drm/vc4/vc4_irq.c | 3 drivers/gpu/drm/vc4/vc4_v3d.c | 3 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 41 -- drivers/i2c/i2c-core-base.c | 6 drivers/i2c/i2c-core-smbus.c | 13 - drivers/infiniband/hw/hfi1/file_ops.c | 4 drivers/infiniband/hw/mlx5/main.c | 11 drivers/infiniband/hw/mlx5/qp.c | 7 drivers/infiniband/ulp/isert/ib_isert.c | 1 drivers/input/misc/twl4030-vibra.c | 6 drivers/input/misc/twl6040-vibra.c | 3 drivers/input/mouse/alps.c | 23 + drivers/input/mouse/alps.h | 10 drivers/input/mouse/synaptics.c | 1 drivers/input/rmi4/rmi_driver.c | 4 drivers/input/touchscreen/88pm860x-ts.c | 16 - drivers/input/touchscreen/of_touchscreen.c | 4 drivers/md/dm-crypt.c | 20 + drivers/md/dm-integrity.c | 49 +- drivers/md/dm-thin-metadata.c | 6 drivers/md/persistent-data/dm-btree.c | 19 - drivers/mmc/host/renesas_sdhi_core.c | 3 drivers/mmc/host/s3cmci.c | 6 drivers/mmc/host/sdhci-esdhc-imx.c | 14 + drivers/mux/core.c | 4 drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 21 - drivers/net/ethernet/cirrus/cs89x0.c | 4 .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 16 + drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 drivers/net/ethernet/freescale/gianfar_ptp.c | 3 drivers/net/ethernet/ibm/ibmvnic.c | 37 + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 16 - .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 48 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 27 + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 3 .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 6 drivers/net/ethernet/mellanox/mlx5/core/main.c | 28 + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 - drivers/net/ethernet/mellanox/mlx5/core/vport.c | 22 + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 1 .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 20 + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 drivers/net/ethernet/qlogic/qed/qed_spq.c | 8 drivers/net/ethernet/renesas/sh_eth.c | 2 drivers/net/ethernet/ti/netcp_core.c | 2 drivers/net/ppp/ppp_generic.c | 5 drivers/net/tun.c | 15 + drivers/net/usb/lan78xx.c | 1 drivers/net/usb/r8152.c | 13 + drivers/net/wireless/ath/wcn36xx/main.c | 23 - drivers/net/wireless/ath/wcn36xx/pmc.c | 6 .../wireless/broadcom/brcm80211/brcmfmac/common.c | 9 drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 10 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 11 drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 drivers/net/wireless/mac80211_hwsim.c | 17 + drivers/nvme/host/fabrics.c | 1 drivers/nvme/host/pci.c | 28 + drivers/of/of_mdio.c | 9 drivers/phy/phy-core.c | 4 drivers/scsi/libsas/sas_scsi_host.c | 17 + drivers/ssb/Kconfig | 2 drivers/staging/android/ashmem.c | 2 drivers/usb/gadget/udc/core.c | 28 + drivers/usb/misc/usb3503.c | 2 drivers/usb/mon/mon_bin.c | 8 drivers/usb/serial/cp210x.c | 2 drivers/usb/storage/unusual_uas.h | 7 drivers/usb/usbip/usbip_common.c | 17 - drivers/usb/usbip/vudc_rx.c | 19 + drivers/usb/usbip/vudc_tx.c | 11 drivers/xen/gntdev.c | 8 fs/proc/array.c | 7 include/linux/bpf.h | 26 + include/linux/compiler-gcc.h | 2 include/linux/completion.h | 1 include/linux/cpu.h | 7 include/linux/crash_core.h | 2 include/linux/delayacct.h | 8 include/linux/irqflags.h | 4 include/linux/lockdep.h | 2 include/linux/mlx5/driver.h | 19 + include/linux/mlx5/mlx5_ifc.h | 5 include/linux/netlink.h | 4 include/linux/ptr_ring.h | 14 - include/linux/vermagic.h | 8 include/net/arp.h | 3 include/net/cfg80211.h | 2 include/net/sch_generic.h | 2 include/net/tls.h | 2 include/uapi/linux/kvm.h | 4 include/uapi/linux/openvswitch.h | 1 init/Kconfig | 8 kernel/bpf/arraymap.c | 61 ++ kernel/bpf/core.c | 23 + kernel/bpf/sockmap.c | 11 kernel/bpf/verifier.c | 105 ++++ kernel/cgroup/cgroup.c | 1 kernel/crash_core.c | 2 kernel/delayacct.c | 42 +- kernel/futex.c | 86 +++ kernel/irq/matrix.c | 20 + kernel/locking/rtmutex.c | 26 + kernel/locking/rtmutex_common.h | 1 kernel/sched/completion.c | 5 kernel/sched/core.c | 6 kernel/sched/membarrier.c | 2 kernel/time/timer.c | 2 kernel/trace/Kconfig | 2 kernel/trace/ring_buffer.c | 61 ++ kernel/trace/trace_events.c | 16 + kernel/workqueue.c | 13 + lib/test_bpf.c | 11 mm/kmemleak.c | 2 mm/memory.c | 10 mm/page_owner.c | 1 net/8021q/vlan.c | 7 net/9p/trans_xen.c | 4 net/bluetooth/l2cap_core.c | 20 - net/caif/caif_dev.c | 5 net/caif/caif_usb.c | 4 net/caif/cfcnfg.c | 10 net/caif/cfctrl.c | 4 net/can/af_can.c | 36 + net/core/filter.c | 10 net/core/flow_dissector.c | 3 net/core/neighbour.c | 4 net/core/sock_diag.c | 2 net/core/sysctl_net_core.c | 6 net/ipv4/arp.c | 7 net/ipv4/esp4.c | 1 net/ipv4/esp4_offload.c | 3 net/ipv4/raw.c | 4 net/ipv4/route.c | 1 net/ipv6/esp6.c | 3 net/ipv6/esp6_offload.c | 3 net/ipv6/exthdrs.c | 9 net/ipv6/ip6_fib.c | 48 +- net/ipv6/ip6_gre.c | 14 - net/ipv6/ip6_output.c | 12 net/key/af_key.c | 12 net/netlink/af_netlink.c | 3 net/openvswitch/flow_netlink.c | 51 -- net/sched/cls_bpf.c | 9 net/sched/sch_api.c | 15 - net/sched/sch_generic.c | 18 + net/sched/sch_ingress.c | 19 - net/sctp/ipv6.c | 1 net/sctp/outqueue.c | 4 net/sctp/socket.c | 68 ++- net/socket.c | 13 - net/tipc/node.c | 26 + net/tls/tls_main.c | 17 + net/tls/tls_sw.c | 16 - net/wireless/core.c | 8 net/wireless/core.h | 2 net/wireless/nl80211.c | 13 - net/wireless/reg.c | 3 net/wireless/wext-compat.c | 3 net/xfrm/xfrm_input.c | 2 net/xfrm/xfrm_policy.c | 15 - net/xfrm/xfrm_state.c | 11 scripts/Makefile.build | 14 - scripts/decodecode | 8 scripts/gdb/linux/tasks.py | 2 scripts/genksyms/.gitignore | 1 scripts/kconfig/expr.c | 5 security/Kconfig | 2 security/apparmor/domain.c | 9 security/apparmor/include/perms.h | 3 security/apparmor/ipc.c | 53 +- sound/core/oss/pcm_oss.c | 41 +- sound/core/oss/pcm_plugin.c | 14 - sound/core/pcm_lib.c | 5 sound/core/pcm_native.c | 9 sound/core/seq/seq_clientmgr.c | 3 sound/core/seq/seq_clientmgr.h | 1 sound/drivers/aloop.c | 98 ++-- sound/pci/hda/patch_cirrus.c | 1 sound/pci/hda/patch_realtek.c | 1 tools/objtool/Makefile | 2 tools/objtool/check.c | 69 +++ tools/objtool/check.h | 2 tools/objtool/elf.c | 4 tools/testing/selftests/bpf/test_align.c | 22 - tools/testing/selftests/bpf/test_verifier.c | 192 ++++++++ tools/testing/selftests/x86/Makefile | 2 tools/testing/selftests/x86/test_vsyscall.c | 500 ++++++++++++++++++++ virt/kvm/arm/mmu.c | 2 virt/kvm/arm/vgic/vgic-init.c | 8 virt/kvm/arm/vgic/vgic-v4.c | 2 369 files changed, 5588 insertions(+), 1693 deletions(-)