Merge tag 'v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:51:31 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993227AbeEOMvijrRx0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:36:11 2018 +0200 Commit: 029ff5125c8c56d5699a4a838114d3383afd8ac9 Gitweb: https://git.linux-mips.org/g/ralf/linux/029ff5125c8c Branch: master --- Documentation/core-api/kernel-api.rst | 13 .../devicetree/bindings/thermal/exynos-thermal.txt | 23 - .../devicetree/bindings/thermal/thermal.txt | 16 .../bindings/timer/nuvoton,npcm7xx-timer.txt | 21 + .../devicetree/bindings/timer/nxp,tpm-timer.txt | 2 Documentation/livepatch/shadow-vars.txt | 41 + Documentation/networking/filter.txt | 6 Documentation/networking/ip-sysctl.txt | 8 MAINTAINERS | 41 + Makefile | 2 arch/arm64/kernel/traps.c | 2 arch/arm64/mm/kasan_init.c | 4 arch/mips/boot/dts/img/boston.dts | 6 arch/mips/include/asm/io.h | 4 arch/mips/include/asm/uaccess.h | 11 arch/mips/lib/memset.S | 11 arch/parisc/kernel/Makefile | 2 arch/powerpc/kernel/eeh_pe.c | 3 arch/powerpc/kernel/idle_book3s.S | 4 arch/powerpc/kernel/setup_64.c | 11 arch/powerpc/lib/feature-fixups.c | 2 arch/powerpc/platforms/cell/spufs/sched.c | 2 arch/powerpc/sysdev/xive/native.c | 4 arch/s390/Kbuild | 1 arch/s390/Kconfig | 32 + arch/s390/boot/Makefile | 6 arch/s390/boot/compressed/.gitignore | 1 arch/s390/configs/debug_defconfig | 30 + arch/s390/configs/gcov_defconfig | 661 ------------------- arch/s390/configs/performance_defconfig | 20 - arch/s390/defconfig | 13 arch/s390/hypfs/inode.c | 2 arch/s390/include/asm/kexec.h | 23 + arch/s390/include/asm/purgatory.h | 17 arch/s390/include/asm/setup.h | 40 + arch/s390/include/uapi/asm/signal.h | 23 - arch/s390/kernel/Makefile | 3 arch/s390/kernel/asm-offsets.c | 5 arch/s390/kernel/compat_wrapper.c | 1 arch/s390/kernel/kexec_elf.c | 147 ++++ arch/s390/kernel/kexec_image.c | 76 ++ arch/s390/kernel/machine_kexec_file.c | 245 +++++++ arch/s390/kernel/nospec-branch.c | 1 arch/s390/kernel/perf_cpum_cf_events.c | 1 arch/s390/kernel/setup.c | 1 arch/s390/kernel/syscalls/syscall.tbl | 1 arch/s390/purgatory/.gitignore | 2 arch/s390/purgatory/Makefile | 37 + arch/s390/purgatory/head.S | 279 ++++++++ arch/s390/purgatory/purgatory.c | 42 + arch/x86/events/intel/uncore_snbep.c | 37 + arch/x86/include/asm/asm.h | 2 arch/x86/include/asm/kvm_host.h | 1 arch/x86/include/asm/processor.h | 2 arch/x86/kernel/acpi/boot.c | 4 arch/x86/kernel/kexec-bzimage64.c | 5 arch/x86/kernel/ldt.c | 2 arch/x86/kernel/pci-nommu.c | 90 --- arch/x86/kernel/smpboot.c | 45 + arch/x86/kernel/tsc.c | 2 arch/x86/kvm/svm.c | 31 + arch/x86/kvm/vmx.c | 95 ++- arch/x86/kvm/x86.c | 15 arch/x86/mm/dump_pagetables.c | 11 arch/x86/power/hibernate_64.c | 2 drivers/atm/iphase.c | 4 drivers/block/rbd.c | 101 ++- drivers/char/random.c | 128 +++- drivers/clocksource/Kconfig | 8 drivers/clocksource/Makefile | 1 drivers/clocksource/timer-imx-tpm.c | 45 + drivers/clocksource/timer-npcm7xx.c | 215 ++++++ drivers/dax/device.c | 2 .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 7 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 16 .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 4 drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 + drivers/gpu/drm/exynos/exynos_drm_fb.c | 73 -- drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 drivers/gpu/drm/i915/gvt/display.c | 10 drivers/gpu/drm/i915/gvt/dmabuf.c | 1 drivers/gpu/drm/i915/gvt/fb_decoder.c | 27 - drivers/gpu/drm/i915/gvt/gtt.c | 52 + drivers/gpu/drm/i915/gvt/gtt.h | 2 drivers/gpu/drm/i915/gvt/handlers.c | 1 drivers/gpu/drm/i915/gvt/kvmgt.c | 2 drivers/gpu/drm/i915/i915_drv.c | 27 - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 drivers/gpu/drm/i915/i915_pmu.c | 37 + drivers/gpu/drm/i915/intel_audio.c | 2 drivers/gpu/drm/i915/intel_bios.c | 13 drivers/gpu/drm/i915/intel_lrc.c | 9 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 drivers/hid/hid-ids.h | 3 drivers/hid/hid-input.c | 24 - drivers/hid/hidraw.c | 5 drivers/hid/i2c-hid/i2c-hid.c | 13 drivers/hid/wacom_wac.c | 76 +- drivers/isdn/mISDN/dsp_hwec.c | 8 drivers/isdn/mISDN/l1oip_core.c | 14 drivers/md/md.c | 6 drivers/md/raid1.c | 25 + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 39 + drivers/mmc/host/sdhci-pci-core.c | 25 + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 12 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 49 + drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 2 drivers/net/ethernet/hisilicon/hns/hnae.h | 2 drivers/net/ethernet/ibm/ibmvnic.c | 85 ++ drivers/net/ethernet/ibm/ibmvnic.h | 1 drivers/net/ethernet/marvell/mvpp2.c | 14 drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 44 + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 drivers/net/ethernet/netronome/nfp/flower/main.c | 6 drivers/net/ethernet/netronome/nfp/flower/main.h | 8 .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 5 .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 11 drivers/net/ethernet/sfc/ef10.c | 7 drivers/net/ethernet/sfc/farch.c | 2 drivers/net/ethernet/sfc/net_driver.h | 25 + drivers/net/ethernet/sfc/rx.c | 60 +- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 drivers/net/macsec.c | 5 drivers/net/phy/microchip.c | 178 +++++ drivers/net/team/team.c | 19 + drivers/net/tun.c | 7 drivers/net/usb/qmi_wwan.c | 1 drivers/net/virtio_net.c | 79 +- drivers/net/vmxnet3/vmxnet3_drv.c | 17 drivers/net/vmxnet3/vmxnet3_int.h | 4 drivers/nvdimm/Kconfig | 3 drivers/nvdimm/dimm_devs.c | 22 - drivers/nvdimm/of_pmem.c | 2 drivers/rapidio/devices/rio_mport_cdev.c | 19 - drivers/s390/block/dasd_diag.c | 1 drivers/s390/char/sclp_early_core.c | 2 drivers/s390/net/qeth_l2_main.c | 1 drivers/s390/net/smsgiucv.c | 2 drivers/watchdog/aspeed_wdt.c | 7 drivers/watchdog/renesas_wdt.c | 6 drivers/watchdog/sch311x_wdt.c | 2 drivers/watchdog/w83977f_wdt.c | 2 drivers/watchdog/wafer5823wdt.c | 2 drivers/xen/xen-pciback/conf_space_quirks.c | 2 drivers/xen/xen-pciback/pci_stub.c | 8 drivers/xen/xenbus/xenbus_dev_frontend.c | 3 fs/afs/server.c | 9 fs/autofs4/root.c | 2 fs/binfmt_elf.c | 8 fs/btrfs/ctree.h | 25 + fs/btrfs/delayed-inode.c | 20 - fs/btrfs/delayed-ref.c | 19 - fs/btrfs/delayed-ref.h | 1 fs/btrfs/disk-io.c | 1 fs/btrfs/extent-tree.c | 73 ++ fs/btrfs/file.c | 2 fs/btrfs/inode.c | 20 - fs/btrfs/print-tree.c | 25 - fs/btrfs/print-tree.h | 2 fs/btrfs/qgroup.c | 43 + fs/btrfs/transaction.c | 1 fs/btrfs/transaction.h | 14 fs/ceph/inode.c | 10 fs/cifs/cifs_debug.h | 2 fs/cifs/dir.c | 9 fs/cifs/file.c | 2 fs/cifs/smb2ops.c | 4 fs/cifs/smbdirect.c | 8 fs/ecryptfs/crypto.c | 41 + fs/ecryptfs/file.c | 21 - fs/ecryptfs/inode.c | 3 fs/ecryptfs/keystore.c | 2 fs/ext2/file.c | 4 fs/fs-writeback.c | 7 fs/isofs/compress.c | 19 - fs/isofs/inode.c | 3 fs/jffs2/super.c | 2 fs/namespace.c | 5 fs/notify/fanotify/fanotify.c | 34 - fs/notify/fsnotify.c | 25 - fs/orangefs/super.c | 5 fs/proc/base.c | 6 fs/proc/loadavg.c | 2 fs/proc/task_mmu.c | 6 fs/quota/dquot.c | 2 fs/super.c | 9 fs/udf/unicode.c | 6 include/drm/drm_hdcp.h | 2 include/linux/backing-dev-defs.h | 5 include/linux/backing-dev.h | 30 - include/linux/compiler-clang.h | 3 include/linux/coresight-pmu.h | 13 include/linux/fsnotify_backend.h | 2 include/linux/hid.h | 9 include/linux/if_vlan.h | 7 include/linux/livepatch.h | 19 - include/linux/microchipphy.h | 8 include/linux/shrinker.h | 7 include/linux/textsearch.h | 4 include/linux/thread_info.h | 6 include/linux/timekeeping32.h | 3 include/linux/timer.h | 2 include/uapi/linux/perf_event.h | 18 - include/uapi/linux/random.h | 3 include/xen/interface/io/sndif.h | 322 +++++++++ kernel/events/callchain.c | 25 - kernel/events/core.c | 8 kernel/fork.c | 3 kernel/livepatch/shadow.c | 108 ++- kernel/time/posix-cpu-timers.c | 4 kernel/time/tick-oneshot.c | 11 kernel/time/timekeeping.c | 7 kernel/trace/trace_kprobe.c | 2 lib/textsearch.c | 40 + mm/filemap.c | 9 mm/huge_memory.c | 5 mm/memcontrol.c | 2 mm/migrate.c | 22 + mm/page-writeback.c | 18 - mm/rmap.c | 3 mm/vmscan.c | 21 + net/caif/chnl_net.c | 2 net/core/dev.c | 2 net/core/dev_addr_lists.c | 2 net/core/neighbour.c | 40 + net/dns_resolver/dns_key.c | 12 net/ipv4/ip_output.c | 8 net/ipv4/tcp.c | 8 net/l2tp/l2tp_core.c | 40 + net/l2tp/l2tp_core.h | 3 net/l2tp/l2tp_debugfs.c | 15 net/l2tp/l2tp_netlink.c | 11 net/l2tp/l2tp_ppp.c | 24 - net/llc/af_llc.c | 7 net/packet/af_packet.c | 23 - net/qrtr/qrtr.c | 1 net/sctp/ipv6.c | 60 +- net/smc/af_smc.c | 10 net/strparser/strparser.c | 7 net/sunrpc/rpc_pipe.c | 1 net/tipc/monitor.c | 2 net/tipc/name_table.c | 34 + net/tipc/name_table.h | 2 net/tipc/net.c | 2 net/tipc/netlink.c | 5 net/tipc/node.c | 11 net/tipc/socket.c | 4 net/tipc/subscr.c | 5 net/tls/tls_sw.c | 10 net/vmw_vsock/af_vsock.c | 6 samples/livepatch/livepatch-shadow-fix1.c | 43 + samples/livepatch/livepatch-shadow-fix2.c | 33 + sound/core/rawmidi_compat.c | 18 - sound/pci/hda/hda_intel.c | 3 sound/pci/hda/patch_realtek.c | 3 sound/usb/line6/midi.c | 2 tools/arch/arm/include/uapi/asm/kvm.h | 9 tools/arch/x86/include/asm/required-features.h | 8 tools/arch/x86/include/uapi/asm/kvm.h | 19 + tools/include/linux/compiler.h | 20 - tools/include/linux/coresight-pmu.h | 13 tools/include/uapi/asm-generic/mman-common.h | 3 tools/include/uapi/linux/bpf.h | 1 tools/include/uapi/linux/if_link.h | 39 + tools/include/uapi/linux/kvm.h | 21 + tools/include/uapi/linux/perf_event.h | 18 - tools/include/uapi/sound/asound.h | 1 tools/lib/subcmd/parse-options.c | 6 tools/objtool/Makefile | 4 tools/perf/Documentation/perf-config.txt | 5 tools/perf/Documentation/perf-mem.txt | 3 tools/perf/Documentation/perf-sched.txt | 4 tools/perf/Documentation/perf-script.txt | 17 tools/perf/Documentation/perf-stat.txt | 2 tools/perf/Makefile.config | 4 tools/perf/arch/arm/include/arch-tests.h | 12 tools/perf/arch/arm/tests/Build | 2 tools/perf/arch/arm/tests/arch-tests.c | 16 tools/perf/arch/arm/util/auxtrace.c | 13 tools/perf/arch/arm/util/cs-etm.c | 13 tools/perf/arch/arm/util/cs-etm.h | 13 tools/perf/arch/arm/util/pmu.c | 13 tools/perf/arch/x86/Makefile | 2 tools/perf/arch/x86/annotate/instructions.c | 67 ++ tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 712 ++++++++++---------- tools/perf/builtin-help.c | 2 tools/perf/builtin-mem.c | 4 tools/perf/builtin-script.c | 9 tools/perf/builtin-stat.c | 14 tools/perf/builtin-version.c | 3 tools/perf/perf.c | 4 tools/perf/tests/bpf-script-example.c | 2 tools/perf/tests/bpf-script-test-kbuild.c | 1 tools/perf/tests/builtin-test.c | 1 tools/perf/tests/mmap-basic.c | 2 tools/perf/trace/beauty/mmap.c | 3 tools/perf/ui/browsers/annotate.c | 5 tools/perf/ui/browsers/hists.c | 2 tools/perf/util/annotate.c | 26 + tools/perf/util/annotate.h | 9 tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 3 tools/perf/util/cs-etm.c | 3 tools/perf/util/cs-etm.h | 13 tools/perf/util/event.c | 4 tools/perf/util/evsel.c | 6 tools/perf/util/generate-cmdlist.sh | 2 tools/perf/util/header.c | 3 tools/perf/util/pmu.c | 6 tools/perf/util/symbol.c | 8 tools/perf/util/syscalltbl.c | 6 tools/perf/util/trace-event-scripting.c | 4 tools/testing/nvdimm/test/nfit.c | 84 ++ tools/testing/selftests/filesystems/Makefile | 8 tools/testing/selftests/kvm/Makefile | 5 tools/testing/selftests/kvm/include/kvm_util.h | 15 tools/testing/selftests/kvm/include/vmx.h | 494 ++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 20 - tools/testing/selftests/kvm/lib/sparsebit.c | 4 tools/testing/selftests/kvm/lib/vmx.c | 243 +++++++ tools/testing/selftests/kvm/vmx_tsc_adjust_test.c | 231 ++++++ tools/testing/selftests/net/Makefile | 2 325 files changed, 5653 insertions(+), 2481 deletions(-)