Merge tag 'v4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:49:27 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993057AbeEOMtcllWV0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:33:16 2018 +0200 Commit: b08fd66ef41cc7564eb3ec5c7be5552aa1330efb Gitweb: https://git.linux-mips.org/g/ralf/linux/b08fd66ef41c Branch: master --- Documentation/ABI/testing/sysfs-ata | 171 +++++++----- Documentation/ABI/testing/sysfs-block-device | 58 ++++ Documentation/ABI/testing/sysfs-class-scsi_host | 89 ++++++ .../bindings/display/exynos/exynos_hdmi.txt | 1 .../bindings/iio/adc/sigma-delta-modulator.txt | 4 .../devicetree/bindings/net/dsa/marvell.txt | 48 ++- .../devicetree/bindings/net/renesas,ravb.txt | 6 Documentation/networking/segmentation-offloads.txt | 18 + MAINTAINERS | 3 Makefile | 11 + arch/arm64/mm/mmu.c | 10 + arch/h8300/include/asm/byteorder.h | 1 arch/mips/lantiq/Kconfig | 2 arch/mips/lantiq/xway/sysctrl.c | 6 arch/mips/ralink/mt7621.c | 42 ++- arch/mips/ralink/reset.c | 7 arch/x86/Kconfig.cpu | 13 - arch/x86/Makefile | 9 + arch/x86/boot/compressed/misc.c | 4 arch/x86/entry/entry_64.S | 2 arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 arch/x86/entry/vsyscall/vsyscall_64.c | 2 arch/x86/events/core.c | 3 arch/x86/events/intel/core.c | 14 - arch/x86/events/intel/ds.c | 6 arch/x86/events/intel/uncore_snbep.c | 32 +- arch/x86/events/perf_event.h | 6 arch/x86/include/asm/barrier.h | 30 -- arch/x86/include/asm/io.h | 15 - arch/x86/include/asm/vmx.h | 1 arch/x86/kernel/idt.c | 2 arch/x86/kernel/pci-nommu.c | 19 - arch/x86/kernel/traps.c | 15 + arch/x86/kvm/vmx.c | 9 + arch/x86/mm/init_64.c | 60 ++-- arch/x86/mm/pgtable.c | 48 +++ arch/x86/net/bpf_jit_comp.c | 3 arch/x86/platform/efi/efi_64.c | 2 arch/x86/um/asm/barrier.h | 4 drivers/acpi/acpi_watchdog.c | 4 drivers/acpi/battery.c | 48 --- drivers/acpi/nfit/core.c | 10 - drivers/acpi/numa.c | 10 - drivers/ata/ahci.c | 4 drivers/ata/libahci.c | 10 + drivers/ata/libahci_platform.c | 2 drivers/ata/libata-core.c | 26 ++ drivers/ata/libata-eh.c | 3 drivers/ata/libata-scsi.c | 12 + drivers/ata/sata_rcar.c | 62 +++- drivers/bluetooth/btusb.c | 8 - drivers/bluetooth/hci_bcm.c | 13 + drivers/clk/bcm/clk-bcm2835.c | 12 + drivers/clk/clk-aspeed.c | 28 +- drivers/clk/clk.c | 46 ++- drivers/clk/hisilicon/clk-hi3660-stub.c | 2 drivers/clk/imx/clk-imx51-imx53.c | 20 + drivers/clk/qcom/apcs-msm8916.c | 5 drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 6 drivers/clk/ti/clk-33xx.c | 2 drivers/clk/ti/clk-43xx.c | 2 drivers/clk/ti/clkctrl.c | 2 drivers/dma/stm32-dmamux.c | 9 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 8 - drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 9 - .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 20 + drivers/gpu/drm/ast/ast_tables.h | 4 drivers/gpu/drm/drm_framebuffer.c | 7 drivers/gpu/drm/i915/intel_ddi.c | 7 drivers/gpu/drm/i915/intel_hangcheck.c | 4 drivers/gpu/drm/imx/ipuv3-crtc.c | 5 drivers/gpu/drm/imx/ipuv3-plane.c | 10 - drivers/gpu/drm/radeon/radeon_connectors.c | 31 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 drivers/gpu/drm/sun4i/sun4i_tcon.c | 5 drivers/gpu/drm/tegra/dc.c | 16 + drivers/gpu/drm/tegra/drm.c | 1 drivers/gpu/drm/tegra/dsi.c | 1 drivers/gpu/drm/tegra/plane.c | 9 - drivers/gpu/drm/udl/udl_fb.c | 9 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 39 ++- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 13 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 5 drivers/gpu/ipu-v3/ipu-prg.c | 12 + drivers/hv/ring_buffer.c | 52 ++-- drivers/iio/accel/st_accel_core.c | 7 drivers/iio/adc/meson_saradc.c | 4 drivers/iio/adc/stm32-dfsdm-adc.c | 39 +-- drivers/iio/adc/stm32-dfsdm-core.c | 12 + drivers/iio/chemical/ccs811.c | 3 drivers/iio/pressure/st_pressure_core.c | 2 drivers/infiniband/core/cma.c | 15 + drivers/infiniband/core/ucma.c | 36 ++ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 4 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 drivers/infiniband/hw/mlx5/main.c | 21 + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 drivers/infiniband/hw/mlx5/mr.c | 12 + drivers/infiniband/hw/mlx5/qp.c | 23 +- drivers/infiniband/hw/mlx5/srq.c | 15 + drivers/media/Kconfig | 2 drivers/media/platform/tegra-cec/tegra_cec.c | 17 - drivers/mmc/core/block.c | 19 + drivers/mmc/core/card.h | 1 drivers/mmc/core/quirks.h | 6 drivers/mmc/host/dw_mmc-exynos.c | 8 - drivers/mmc/host/dw_mmc.c | 15 + drivers/mmc/host/sdhci-acpi.c | 2 drivers/mtd/mtdchar.c | 4 drivers/mtd/nand/fsl_ifc_nand.c | 32 +- drivers/net/can/cc770/cc770.c | 100 ++++--- drivers/net/can/cc770/cc770.h | 2 drivers/net/can/ifi_canfd/ifi_canfd.c | 75 +++-- drivers/net/can/m_can/m_can.c | 7 drivers/net/can/peak_canfd/peak_canfd.c | 25 +- drivers/net/can/peak_canfd/peak_pciefd_main.c | 8 - drivers/net/dsa/Makefile | 5 drivers/net/dsa/b53/b53_common.c | 4 drivers/net/ethernet/8390/Kconfig | 2 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 22 ++ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 15 + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 7 drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 2 drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 11 - .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 66 +++-- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 1 drivers/net/ethernet/aquantia/atlantic/ver.h | 2 drivers/net/ethernet/arc/emac_rockchip.c | 6 drivers/net/ethernet/broadcom/bcmsysport.c | 33 +- drivers/net/ethernet/broadcom/bcmsysport.h | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 180 ++++++------ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 33 ++ drivers/net/ethernet/broadcom/tg3.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 drivers/net/ethernet/cortina/gemini.c | 1 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 8 - drivers/net/ethernet/freescale/fec_main.c | 2 drivers/net/ethernet/freescale/fman/fman_dtsec.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 drivers/net/ethernet/intel/e1000e/defines.h | 21 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 42 +-- drivers/net/ethernet/intel/e1000e/mac.c | 25 +- drivers/net/ethernet/intel/e1000e/netdev.c | 37 +-- .../mellanox/mlxsw/core_acl_flex_actions.c | 11 + .../mellanox/mlxsw/core_acl_flex_actions.h | 1 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 28 ++ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 4 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 5 .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 12 - .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 2 drivers/net/ethernet/natsemi/Kconfig | 6 drivers/net/ethernet/natsemi/Makefile | 2 drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 17 + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 drivers/net/ethernet/qlogic/qede/qede_main.c | 8 - drivers/net/ethernet/qlogic/qede/qede_ptp.c | 2 drivers/net/ethernet/qualcomm/emac/emac-mac.c | 23 +- drivers/net/ethernet/smsc/smsc911x.c | 4 drivers/net/ethernet/socionext/sni_ave.c | 2 drivers/net/ethernet/sun/sunvnet.c | 2 drivers/net/ethernet/ti/cpsw.c | 3 drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc.c | 52 ++-- drivers/net/hyperv/netvsc_drv.c | 293 +++++++++++--------- drivers/net/hyperv/rndis_filter.c | 68 ++--- drivers/net/macsec.c | 5 drivers/net/macvlan.c | 2 drivers/net/phy/bcm-phy-lib.c | 4 drivers/net/phy/marvell.c | 4 drivers/net/phy/micrel.c | 27 -- drivers/net/phy/phy.c | 145 +++++----- drivers/net/phy/phy_device.c | 32 ++ drivers/net/phy/realtek.c | 2 drivers/net/ppp/ppp_generic.c | 26 +- drivers/net/team/team.c | 4 drivers/net/tun.c | 3 drivers/net/usb/usbnet.c | 10 - drivers/net/vmxnet3/vmxnet3_drv.c | 16 + drivers/net/vmxnet3/vmxnet3_int.h | 7 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 10 + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 3 .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 24 +- drivers/net/wireless/intel/iwlwifi/Kconfig | 1 .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 4 drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 13 + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 3 drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 18 + drivers/net/wireless/intel/iwlwifi/fw/init.c | 12 + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 7 drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 8 + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 5 drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 49 +++ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 10 + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 28 +- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 39 +-- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 33 +- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 6 drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 13 + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 2 drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 drivers/net/wireless/mac80211_hwsim.c | 1 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 3 drivers/nvdimm/blk.c | 3 drivers/nvdimm/btt.c | 3 drivers/nvdimm/pfn_devs.c | 2 drivers/nvdimm/region_devs.c | 17 + drivers/pci/quirks.c | 2 drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 56 +++- drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 14 + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 28 ++ drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 7 drivers/pinctrl/samsung/pinctrl-samsung.c | 61 +++- drivers/pinctrl/samsung/pinctrl-samsung.h | 40 ++- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 1 drivers/s390/net/qeth_core_main.c | 21 + drivers/s390/net/qeth_l2_main.c | 2 drivers/s390/net/qeth_l3_main.c | 2 drivers/scsi/libsas/sas_scsi_host.c | 33 +- drivers/scsi/qla2xxx/qla_init.c | 1 drivers/soc/fsl/qbman/qman.c | 28 -- drivers/staging/ncpfs/ncplib_kernel.c | 4 drivers/tty/vt/vt.c | 8 - drivers/vfio/pci/vfio_pci.c | 3 drivers/vhost/net.c | 8 - drivers/watchdog/wdat_wdt.c | 2 fs/hugetlbfs/inode.c | 17 + fs/nfsd/nfs4state.c | 62 +++- fs/sysfs/symlink.c | 1 include/asm-generic/pgtable.h | 10 + include/linux/cgroup-defs.h | 4 include/linux/fsl_ifc.h | 6 include/linux/if_tun.h | 4 include/linux/if_vlan.h | 66 ++++- include/linux/jump_label.h | 4 include/linux/memblock.h | 1 include/linux/mlx5/driver.h | 4 include/linux/net.h | 1 include/linux/netfilter/x_tables.h | 2 include/linux/percpu-refcount.h | 18 + include/linux/phy.h | 5 include/linux/rhashtable.h | 4 include/linux/skbuff.h | 22 ++ include/linux/u64_stats_sync.h | 22 ++ include/linux/workqueue.h | 1 include/net/ip.h | 11 + include/net/ip6_route.h | 3 include/net/ip_fib.h | 1 include/net/mac80211.h | 4 include/net/route.h | 6 include/net/sch_generic.h | 19 + include/net/sock.h | 1 include/rdma/ib_verbs.h | 4 include/trace/events/mmc.h | 4 include/uapi/linux/if_ether.h | 1 include/uapi/linux/lirc.h | 1 include/uapi/linux/usb/audio.h | 4 init/main.c | 2 ipc/mqueue.c | 74 +---- kernel/bpf/syscall.c | 2 kernel/cgroup/cgroup.c | 10 + kernel/events/core.c | 21 + kernel/fail_function.c | 10 + kernel/jump_label.c | 7 kernel/locking/mutex.c | 37 ++- kernel/memremap.c | 1 kernel/module.c | 2 kernel/sched/core.c | 15 + kernel/sched/debug.c | 29 +- kernel/time/posix-timers.c | 11 + kernel/trace/bpf_trace.c | 68 +++-- kernel/trace/trace_kprobe.c | 4 kernel/trace/trace_probe.c | 8 - kernel/trace/trace_probe.h | 2 kernel/workqueue.c | 10 - lib/ioremap.c | 6 lib/percpu-refcount.c | 2 lib/rhashtable.c | 4 lib/test_bpf.c | 2 lib/test_rhashtable.c | 134 +++++++++ mm/huge_memory.c | 9 - mm/hugetlb.c | 7 mm/khugepaged.c | 15 + mm/memblock.c | 28 -- mm/mempolicy.c | 3 mm/page_alloc.c | 13 - mm/percpu-km.c | 8 - mm/percpu-vm.c | 18 + mm/percpu.c | 67 +++-- mm/shmem.c | 31 +- mm/vmscan.c | 31 +- net/8021q/vlan_core.c | 4 net/batman-adv/distributed-arp-table.c | 2 net/batman-adv/icmp_socket.c | 1 net/batman-adv/log.c | 1 net/batman-adv/multicast.c | 4 net/batman-adv/routing.c | 25 +- net/bluetooth/smp.c | 8 - net/bridge/netfilter/ebt_among.c | 34 ++ net/bridge/netfilter/ebtables.c | 6 net/core/dev.c | 22 +- net/core/dev_ioctl.c | 7 net/core/devlink.c | 16 - net/core/filter.c | 60 +++- net/core/skbuff.c | 11 - net/core/sock.c | 21 + net/core/sock_diag.c | 12 - net/dccp/proto.c | 5 net/dsa/legacy.c | 2 net/ieee802154/6lowpan/core.c | 12 + net/ipv4/inet_diag.c | 3 net/ipv4/inet_fragment.c | 3 net/ipv4/ip_sockglue.c | 6 net/ipv4/route.c | 47 ++- net/ipv4/tcp.c | 1 net/ipv4/tcp_timer.c | 1 net/ipv4/xfrm4_mode_tunnel.c | 3 net/ipv4/xfrm4_policy.c | 5 net/ipv6/datagram.c | 21 + net/ipv6/ip6_gre.c | 8 - net/ipv6/ndisc.c | 3 net/ipv6/route.c | 76 +++-- net/ipv6/seg6_iptunnel.c | 7 net/ipv6/xfrm6_mode_tunnel.c | 3 net/ipv6/xfrm6_policy.c | 5 net/iucv/af_iucv.c | 4 net/kcm/kcmsock.c | 33 ++ net/l2tp/l2tp_core.c | 46 ++- net/l2tp/l2tp_core.h | 3 net/mac80211/debugfs.c | 1 net/mac80211/mlme.c | 3 net/netfilter/nf_tables_api.c | 1 net/netfilter/nft_set_hash.c | 2 net/netfilter/x_tables.c | 30 ++ net/netfilter/xt_hashlimit.c | 16 + net/netfilter/xt_recent.c | 6 net/netlink/genetlink.c | 2 net/openvswitch/meter.c | 12 + net/sched/act_bpf.c | 2 net/sched/act_csum.c | 5 net/sched/act_ipt.c | 9 - net/sched/act_pedit.c | 2 net/sched/act_police.c | 2 net/sched/act_sample.c | 3 net/sched/act_simple.c | 2 net/sched/act_skbmod.c | 5 net/sched/act_tunnel_key.c | 10 - net/sched/act_vlan.c | 5 net/sched/sch_generic.c | 22 +- net/sched/sch_netem.c | 2 net/sctp/input.c | 8 - net/sctp/inqueue.c | 2 net/sctp/offload.c | 2 net/smc/af_smc.c | 4 net/smc/smc_close.c | 25 -- net/socket.c | 5 net/xfrm/xfrm_ipcomp.c | 2 net/xfrm/xfrm_policy.c | 13 + net/xfrm/xfrm_replay.c | 2 net/xfrm/xfrm_state.c | 5 net/xfrm/xfrm_user.c | 21 + sound/drivers/aloop.c | 17 + sound/pci/hda/hda_intel.c | 5 sound/pci/hda/patch_realtek.c | 20 + tools/bpf/bpftool/common.c | 4 .../ftrace/test.d/kprobe/kprobe_args_string.tc | 46 +++ .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 97 +++++++ .../selftests/ftrace/test.d/kprobe/probepoint.tc | 43 +++ tools/testing/selftests/x86/ptrace_syscall.c | 8 - 388 files changed, 3887 insertions(+), 2117 deletions(-)