Merge tag 'v4.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:51:47 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993488AbeEOMvuV2Km0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:37:14 2018 +0200 Commit: 7fda13b408a390ea0ed78adcf831fd69f5afe312 Gitweb: https://git.linux-mips.org/g/ralf/linux/7fda13b408a3 Branch: master --- Documentation/bpf/bpf_devel_QA.txt | 10 + .../devicetree/bindings/input/atmel,maxtouch.txt | 7 + Documentation/doc-guide/parse-headers.rst | 4 Documentation/media/uapi/rc/keytable.c.rst | 2 Documentation/media/uapi/v4l/v4l2grab.c.rst | 2 Documentation/sphinx/parse-headers.pl | 4 .../zh_CN/video4linux/v4l2-framework.txt | 4 MAINTAINERS | 24 +- Makefile | 4 arch/arm64/include/asm/kvm_emulate.h | 2 arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 24 ++ arch/hexagon/include/asm/io.h | 6 + arch/hexagon/lib/checksum.c | 1 arch/parisc/Makefile | 3 arch/parisc/kernel/drivers.c | 7 - arch/parisc/kernel/pci.c | 2 arch/parisc/kernel/time.c | 2 arch/parisc/kernel/traps.c | 11 + arch/parisc/mm/init.c | 2 arch/sparc/include/uapi/asm/oradax.h | 2 arch/sparc/kernel/vio.c | 2 arch/x86/kernel/cpu/common.c | 6 + arch/x86/kernel/tsc.c | 22 +- arch/x86/kvm/lapic.c | 37 ++-- arch/x86/net/bpf_jit_comp.c | 18 +- arch/x86/xen/enlighten_pv.c | 86 +++------ block/blk-mq.c | 40 +++- block/blk-mq.h | 4 block/genhd.c | 12 + block/partition-generic.c | 10 + drivers/clk/clk-cs2000-cp.c | 2 drivers/clk/clk-mux.c | 10 + drivers/clk/clk-stm32mp1.c | 54 ++--- drivers/clk/clk.c | 7 - drivers/clk/meson/clk-regmap.c | 11 + drivers/clk/meson/gxbb-aoclk.h | 2 drivers/clk/meson/meson8b.c | 5 - drivers/cpufreq/cppc_cpufreq.c | 46 ++++- drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 drivers/gpu/drm/i915/intel_csr.c | 1 drivers/gpu/drm/vc4/vc4_crtc.c | 46 +++++ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 31 +-- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 + drivers/infiniband/Kconfig | 5 - drivers/infiniband/core/cache.c | 55 ++++-- drivers/infiniband/core/cma.c | 60 ++++-- drivers/infiniband/core/iwpm_util.c | 5 - drivers/infiniband/core/mad.c | 4 drivers/infiniband/core/roce_gid_mgmt.c | 26 +-- drivers/infiniband/core/ucma.c | 44 +++- drivers/infiniband/core/uverbs_cmd.c | 6 + drivers/infiniband/core/uverbs_ioctl.c | 9 + .../infiniband/core/uverbs_std_types_flow_action.c | 12 + drivers/infiniband/core/verbs.c | 1 drivers/infiniband/hw/cxgb4/cq.c | 11 + drivers/infiniband/hw/cxgb4/device.c | 9 + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 6 + drivers/infiniband/hw/cxgb4/qp.c | 4 drivers/infiniband/hw/cxgb4/resource.c | 26 ++- drivers/infiniband/hw/hfi1/affinity.c | 11 + drivers/infiniband/hw/hfi1/driver.c | 19 ++ drivers/infiniband/hw/hfi1/hfi.h | 8 - drivers/infiniband/hw/hfi1/init.c | 43 +++- drivers/infiniband/hw/hfi1/pcie.c | 3 drivers/infiniband/hw/hfi1/platform.c | 1 drivers/infiniband/hw/hfi1/qsfp.c | 2 drivers/infiniband/hw/hfi1/ruc.c | 50 ++++- drivers/infiniband/hw/hfi1/ud.c | 4 drivers/infiniband/hw/hns/hns_roce_hem.c | 12 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 49 +++-- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 drivers/infiniband/hw/mlx4/mr.c | 2 drivers/infiniband/hw/mlx4/qp.c | 3 drivers/infiniband/hw/mlx5/Kconfig | 1 drivers/infiniband/hw/mlx5/main.c | 9 - drivers/infiniband/hw/mlx5/mr.c | 32 ++- drivers/infiniband/hw/mlx5/qp.c | 22 +- drivers/infiniband/hw/nes/nes_nic.c | 2 drivers/infiniband/sw/rxe/rxe_opcode.c | 2 drivers/infiniband/sw/rxe/rxe_req.c | 1 drivers/infiniband/sw/rxe/rxe_resp.c | 6 - drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 drivers/infiniband/ulp/srp/Kconfig | 2 drivers/infiniband/ulp/srpt/Kconfig | 2 drivers/input/input-leds.c | 8 - drivers/input/mouse/alps.c | 2 drivers/input/rmi4/rmi_spi.c | 7 + drivers/input/touchscreen/Kconfig | 2 drivers/input/touchscreen/atmel_mxt_ts.c | 200 ++++++++++++-------- drivers/iommu/amd_iommu.c | 2 drivers/iommu/dma-iommu.c | 54 +++-- drivers/iommu/dmar.c | 2 drivers/iommu/intel_irq_remapping.c | 2 drivers/iommu/rockchip-iommu.c | 11 + drivers/irqchip/qcom-irq-combiner.c | 4 drivers/md/bcache/alloc.c | 5 - drivers/md/bcache/bcache.h | 4 drivers/md/bcache/debug.c | 3 drivers/md/bcache/io.c | 8 - drivers/md/bcache/request.c | 5 - drivers/md/bcache/super.c | 75 +++++--- drivers/md/bcache/writeback.c | 4 drivers/media/i2c/saa7115.c | 2 drivers/media/i2c/saa711x_regs.h | 2 drivers/media/i2c/tda7432.c | 2 drivers/media/i2c/tvp5150.c | 2 drivers/media/i2c/tvp5150_reg.h | 2 drivers/media/i2c/tvp7002.c | 2 drivers/media/i2c/tvp7002_reg.h | 2 drivers/media/media-devnode.c | 2 drivers/media/pci/bt8xx/bttv-audio-hook.c | 2 drivers/media/pci/bt8xx/bttv-audio-hook.h | 2 drivers/media/pci/bt8xx/bttv-cards.c | 4 drivers/media/pci/bt8xx/bttv-driver.c | 2 drivers/media/pci/bt8xx/bttv-i2c.c | 2 drivers/media/pci/cx23885/cx23885-input.c | 2 drivers/media/pci/cx88/cx88-alsa.c | 4 drivers/media/pci/cx88/cx88-blackbird.c | 2 drivers/media/pci/cx88/cx88-core.c | 2 drivers/media/pci/cx88/cx88-i2c.c | 2 drivers/media/pci/cx88/cx88-video.c | 2 drivers/media/radio/radio-aimslab.c | 2 drivers/media/radio/radio-aztech.c | 2 drivers/media/radio/radio-gemtek.c | 2 drivers/media/radio/radio-maxiradio.c | 2 drivers/media/radio/radio-rtrack2.c | 2 drivers/media/radio/radio-sf16fmi.c | 2 drivers/media/radio/radio-terratec.c | 2 drivers/media/radio/radio-trust.c | 2 drivers/media/radio/radio-typhoon.c | 2 drivers/media/radio/radio-zoltrix.c | 2 drivers/media/rc/keymaps/rc-avermedia-m135a.c | 2 drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 2 drivers/media/rc/keymaps/rc-encore-enltv2.c | 2 drivers/media/rc/keymaps/rc-kaiomy.c | 2 .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 2 drivers/media/rc/keymaps/rc-pixelview-new.c | 2 drivers/media/tuners/tea5761.c | 4 drivers/media/tuners/tea5767.c | 4 drivers/media/tuners/tuner-xc2028-types.h | 2 drivers/media/tuners/tuner-xc2028.c | 4 drivers/media/tuners/tuner-xc2028.h | 2 drivers/media/usb/em28xx/em28xx-camera.c | 2 drivers/media/usb/em28xx/em28xx-cards.c | 2 drivers/media/usb/em28xx/em28xx-core.c | 4 drivers/media/usb/em28xx/em28xx-dvb.c | 4 drivers/media/usb/em28xx/em28xx-i2c.c | 2 drivers/media/usb/em28xx/em28xx-input.c | 2 drivers/media/usb/em28xx/em28xx-video.c | 4 drivers/media/usb/em28xx/em28xx.h | 2 drivers/media/usb/gspca/zc3xx-reg.h | 2 drivers/media/usb/tm6000/tm6000-cards.c | 2 drivers/media/usb/tm6000/tm6000-core.c | 2 drivers/media/usb/tm6000/tm6000-i2c.c | 2 drivers/media/usb/tm6000/tm6000-regs.h | 2 drivers/media/usb/tm6000/tm6000-usb-isoc.h | 2 drivers/media/usb/tm6000/tm6000-video.c | 2 drivers/media/usb/tm6000/tm6000.h | 2 drivers/media/v4l2-core/v4l2-dev.c | 4 drivers/media/v4l2-core/v4l2-ioctl.c | 2 drivers/media/v4l2-core/videobuf-core.c | 6 - drivers/media/v4l2-core/videobuf-dma-contig.c | 2 drivers/media/v4l2-core/videobuf-dma-sg.c | 6 - drivers/media/v4l2-core/videobuf-vmalloc.c | 4 drivers/net/ethernet/broadcom/bcmsysport.c | 18 +- drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 2 drivers/net/ethernet/marvell/mvpp2.c | 30 ++- drivers/net/ethernet/mellanox/mlx4/main.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 8 + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 - .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 20 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 26 ++- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 12 + drivers/net/ethernet/netronome/nfp/flower/action.c | 10 + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 5 - drivers/net/ethernet/netronome/nfp/flower/main.c | 2 drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 2 drivers/net/ethernet/netronome/nfp/nfp_main.h | 4 drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 31 ++- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 2 drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 drivers/net/ethernet/realtek/8139too.c | 2 drivers/net/ethernet/sfc/ef10.c | 5 - drivers/net/ethernet/sfc/rx.c | 2 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/phy/phy_device.c | 11 + drivers/net/usb/qmi_wwan.c | 13 + .../broadcom/brcm80211/brcmfmac/firmware.c | 36 ++-- drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 13 + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 111 ++++++++++- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 6 - drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 15 -- .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 11 + drivers/net/wireless/realtek/rtlwifi/wifi.h | 5 + drivers/nvme/host/Kconfig | 2 drivers/nvme/host/core.c | 27 --- drivers/nvme/host/fabrics.c | 6 + drivers/nvme/host/multipath.c | 24 ++ drivers/nvme/host/nvme.h | 12 + drivers/nvme/target/Kconfig | 2 drivers/nvme/target/loop.c | 6 + drivers/parisc/ccio-dma.c | 2 drivers/platform/x86/Kconfig | 2 drivers/platform/x86/asus-wireless.c | 4 drivers/remoteproc/qcom_q6v5_pil.c | 2 drivers/remoteproc/remoteproc_core.c | 4 drivers/rpmsg/rpmsg_char.c | 2 drivers/sbus/char/oradax.c | 2 drivers/scsi/isci/port_config.c | 3 drivers/scsi/storvsc_drv.c | 7 + drivers/staging/media/imx/imx-media-csi.c | 2 drivers/target/target_core_iblock.c | 8 - drivers/usb/core/config.c | 4 drivers/usb/dwc2/core.h | 2 drivers/usb/dwc2/gadget.c | 21 ++ drivers/usb/dwc2/hcd.c | 13 + drivers/usb/dwc2/pci.c | 4 drivers/usb/dwc3/gadget.c | 4 drivers/usb/gadget/function/f_phonet.c | 2 drivers/usb/host/ehci-mem.c | 3 drivers/usb/host/ehci-sched.c | 6 - drivers/usb/host/xhci.c | 1 drivers/usb/musb/musb_gadget.c | 3 drivers/usb/musb/musb_host.c | 4 drivers/usb/serial/option.c | 5 + drivers/usb/serial/visor.c | 69 ++++--- drivers/usb/typec/tcpm.c | 1 drivers/usb/typec/tps6598x.c | 47 ++++- fs/btrfs/extent-tree.c | 7 + fs/btrfs/relocation.c | 2 fs/btrfs/send.c | 4 fs/cifs/Kconfig | 2 fs/fs-writeback.c | 2 fs/xfs/libxfs/xfs_attr.c | 9 + fs/xfs/libxfs/xfs_bmap.c | 4 fs/xfs/libxfs/xfs_inode_buf.c | 21 ++ fs/xfs/xfs_file.c | 24 ++ include/dt-bindings/clock/stm32mp1-clks.h | 4 include/kvm/arm_vgic.h | 1 include/linux/bpf.h | 4 include/linux/clk-provider.h | 3 include/linux/genhd.h | 4 include/linux/mlx5/driver.h | 12 - include/linux/remoteproc.h | 2 include/linux/usb/composite.h | 2 include/linux/wait_bit.h | 17 ++ include/media/i2c/tvp7002.h | 2 include/media/videobuf-core.h | 4 include/media/videobuf-dma-sg.h | 4 include/media/videobuf-vmalloc.h | 2 include/net/tls.h | 1 include/trace/events/initcall.h | 14 + include/uapi/linux/if_infiniband.h | 2 include/uapi/linux/rds.h | 2 include/uapi/linux/tls.h | 2 include/uapi/rdma/cxgb3-abi.h | 2 include/uapi/rdma/cxgb4-abi.h | 2 include/uapi/rdma/hns-abi.h | 2 include/uapi/rdma/ib_user_cm.h | 2 include/uapi/rdma/ib_user_ioctl_verbs.h | 2 include/uapi/rdma/ib_user_mad.h | 2 include/uapi/rdma/ib_user_sa.h | 2 include/uapi/rdma/ib_user_verbs.h | 2 include/uapi/rdma/mlx4-abi.h | 2 include/uapi/rdma/mlx5-abi.h | 2 include/uapi/rdma/mthca-abi.h | 2 include/uapi/rdma/nes-abi.h | 2 include/uapi/rdma/qedr-abi.h | 2 include/uapi/rdma/rdma_user_cm.h | 2 include/uapi/rdma/rdma_user_ioctl.h | 2 include/uapi/rdma/rdma_user_rxe.h | 2 kernel/bpf/arraymap.c | 3 kernel/bpf/sockmap.c | 99 +++++++--- kernel/bpf/syscall.c | 4 kernel/events/uprobes.c | 7 - kernel/time/clocksource.c | 63 ++++-- kernel/trace/ftrace.c | 4 kernel/trace/trace_events_hist.c | 12 + kernel/trace/trace_stack.c | 2 kernel/trace/trace_uprobe.c | 35 +--- kernel/tracepoint.c | 4 lib/errseq.c | 23 +- lib/swiotlb.c | 2 mm/backing-dev.c | 3 net/bridge/br_if.c | 4 net/compat.c | 6 - net/core/ethtool.c | 5 + net/core/filter.c | 1 net/dccp/ccids/ccid2.c | 14 + net/dccp/timer.c | 2 net/ipv4/route.c | 118 +++++------- net/ipv4/tcp.c | 7 - net/ipv4/tcp_bbr.c | 4 net/ipv6/route.c | 7 + net/rds/ib_cm.c | 3 net/rds/recv.c | 1 net/sched/sch_fq.c | 37 +++- net/sctp/inqueue.c | 2 net/sctp/ipv6.c | 3 net/sctp/sm_statefuns.c | 8 + net/sctp/stream.c | 2 net/smc/af_smc.c | 61 +++--- net/smc/smc_core.c | 22 ++ net/smc/smc_core.h | 3 net/tipc/node.c | 2 net/tls/tls_main.c | 7 + samples/sockmap/Makefile | 7 + scripts/Makefile.gcc-plugins | 2 scripts/Makefile.lib | 2 scripts/extract_xc3028.pl | 2 scripts/genksyms/Makefile | 4 scripts/mod/sumversion.c | 9 - scripts/split-man.pl | 2 sound/core/pcm_compat.c | 2 sound/core/seq/seq_virmidi.c | 4 sound/drivers/aloop.c | 17 ++ sound/firewire/amdtp-stream.c | 5 - sound/pci/hda/patch_realtek.c | 2 tools/bpf/Makefile | 2 tools/bpf/bpf_dbg.c | 7 + tools/power/acpi/Makefile.config | 1 tools/testing/selftests/bpf/test_progs.c | 4 tools/testing/selftests/lib.mk | 8 - tools/testing/selftests/net/Makefile | 3 virt/kvm/arm/vgic/vgic-init.c | 2 virt/kvm/arm/vgic/vgic-mmio.c | 10 + virt/kvm/arm/vgic/vgic-v2.c | 38 ++-- virt/kvm/arm/vgic/vgic-v3.c | 49 +++-- virt/kvm/arm/vgic/vgic.c | 30 +-- virt/kvm/arm/vgic/vgic.h | 14 + 333 files changed, 2197 insertions(+), 1241 deletions(-)