Merge tag 'v4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 31 Aug 2018 03:38:39 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994706AbeHaBin3f4z2/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 01:48:12 2018 +0200 Commit: 4139c638d3e45ae43f55e855f1a2093028c64216 Gitweb: https://git.linux-mips.org/g/ralf/linux/4139c638d3e4 Branch: master --- Documentation/device-mapper/writecache.txt | 2 .../bindings/arm/samsung/samsung-boards.txt | 2 .../devicetree/bindings/display/tilcdc/tilcdc.txt | 2 .../bindings/gpio/nintendo,hollywood-gpio.txt | 2 .../bindings/input/touchscreen/hideep.txt | 2 .../interrupt-controller/nvidia,tegra20-ictlr.txt | 2 .../interrupt-controller/st,stm32-exti.txt | 2 .../devicetree/bindings/mips/brcm/soc.txt | 2 Documentation/devicetree/bindings/net/fsl-fman.txt | 2 .../devicetree/bindings/power/power_domain.txt | 2 .../devicetree/bindings/regulator/tps65090.txt | 2 .../devicetree/bindings/reset/st,sti-softreset.txt | 2 .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 2 .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 2 .../devicetree/bindings/sound/qcom,apq8096.txt | 2 Documentation/devicetree/bindings/w1/w1-gpio.txt | 2 Documentation/networking/bonding.txt | 2 Documentation/networking/e100.rst | 27 ++- Documentation/networking/e1000.rst | 187 ++++++++++++-------- MAINTAINERS | 9 - Makefile | 2 arch/alpha/kernel/osf_sys.c | 5 - arch/arc/Kconfig | 2 arch/arc/Makefile | 15 -- arch/arc/configs/axs101_defconfig | 1 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/arc/configs/haps_hs_defconfig | 1 arch/arc/configs/haps_hs_smp_defconfig | 1 arch/arc/configs/hsdk_defconfig | 1 arch/arc/configs/nsim_700_defconfig | 1 arch/arc/configs/nsim_hs_defconfig | 1 arch/arc/configs/nsim_hs_smp_defconfig | 1 arch/arc/configs/nsimosci_defconfig | 1 arch/arc/configs/nsimosci_hs_defconfig | 1 arch/arc/configs/nsimosci_hs_smp_defconfig | 1 arch/arc/configs/tb10x_defconfig | 1 arch/arc/include/asm/entry-compact.h | 6 + arch/arc/include/asm/entry.h | 3 arch/arc/include/asm/mach_desc.h | 2 arch/arc/include/asm/page.h | 2 arch/arc/include/asm/pgtable.h | 2 arch/arc/kernel/irq.c | 2 arch/arc/kernel/process.c | 47 ++++- arch/arc/plat-hsdk/Kconfig | 3 arch/arc/plat-hsdk/platform.c | 62 +++++++ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 arch/arm/boot/dts/omap4-droid4-xt894.dts | 9 - arch/ia64/kernel/perfmon.c | 6 - arch/ia64/mm/init.c | 12 - arch/nds32/Kconfig | 12 + arch/nds32/Makefile | 2 arch/nds32/include/asm/cacheflush.h | 9 + arch/nds32/include/asm/futex.h | 2 arch/nds32/kernel/setup.c | 3 arch/nds32/mm/cacheflush.c | 100 ++++------- arch/powerpc/Makefile | 1 arch/powerpc/include/asm/mmu_context.h | 4 arch/powerpc/kernel/idle_book3s.S | 2 arch/powerpc/kvm/book3s_64_vio.c | 2 arch/powerpc/kvm/book3s_64_vio_hv.c | 6 - arch/powerpc/mm/mmu_context_iommu.c | 37 ++++ arch/powerpc/xmon/xmon.c | 4 arch/x86/Kconfig | 2 arch/x86/events/intel/ds.c | 8 + arch/x86/include/asm/apm.h | 6 - arch/x86/include/asm/uaccess_64.h | 7 + arch/x86/kernel/apm_32.c | 5 + arch/x86/kernel/cpu/mcheck/mce.c | 3 arch/x86/kernel/kvmclock.c | 12 + arch/x86/kvm/Kconfig | 2 arch/x86/kvm/vmx.c | 61 ++++--- arch/x86/kvm/x86.c | 4 crypto/af_alg.c | 4 drivers/acpi/ec.c | 2 drivers/cpufreq/intel_pstate.c | 17 ++ drivers/cpufreq/pcc-cpufreq.c | 4 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 47 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 - drivers/gpu/drm/amd/display/dc/dc.h | 1 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 drivers/gpu/drm/drm_lease.c | 16 -- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 drivers/gpu/drm/nouveau/dispnv50/disp.c | 53 +++--- drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 - drivers/gpu/drm/nouveau/nouveau_connector.c | 9 + drivers/gpu/drm/nouveau/nouveau_connector.h | 36 +++- drivers/gpu/drm/nouveau/nouveau_display.c | 10 + drivers/gpu/drm/nouveau/nouveau_drm.c | 18 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 3 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c | 9 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 1 drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 drivers/iommu/intel-iommu.c | 32 +++ drivers/md/dm-writecache.c | 43 +++-- drivers/misc/cxl/api.c | 8 - drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 4 drivers/net/ethernet/aquantia/atlantic/aq_main.c | 11 - drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 47 +++-- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 drivers/net/ethernet/broadcom/bcmsysport.c | 4 drivers/net/ethernet/broadcom/bcmsysport.h | 3 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 24 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 30 +++ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 drivers/net/ethernet/broadcom/tg3.c | 13 + drivers/net/ethernet/broadcom/tg3.h | 2 drivers/net/ethernet/cadence/macb.h | 11 + drivers/net/ethernet/cadence/macb_main.c | 36 +++- drivers/net/ethernet/cavium/Kconfig | 12 + drivers/net/ethernet/cavium/liquidio/lio_main.c | 5 - drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 14 + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 35 +--- drivers/net/ethernet/ibm/ibmvnic.c | 43 +++-- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 12 + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 48 +++-- drivers/net/ethernet/qlogic/qed/qed.h | 1 drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 drivers/net/ethernet/qlogic/qed/qed_main.c | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 39 +++- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 2 drivers/net/ethernet/qualcomm/qca_spi.c | 21 +- drivers/net/ethernet/realtek/r8169.c | 1 drivers/net/ethernet/renesas/ravb_main.c | 93 ++-------- drivers/net/ethernet/renesas/sh_eth.c | 94 ++-------- drivers/net/ethernet/sfc/ef10.c | 30 ++- drivers/net/ethernet/sfc/efx.c | 17 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 drivers/net/hyperv/netvsc.c | 17 +- drivers/net/hyperv/rndis_filter.c | 1 drivers/net/ieee802154/adf7242.c | 34 +++- drivers/net/ieee802154/at86rf230.c | 15 +- drivers/net/ieee802154/fakelb.c | 2 drivers/net/ieee802154/mcr20a.c | 3 drivers/net/phy/marvell.c | 54 ++++-- drivers/net/phy/phy_device.c | 7 - drivers/net/phy/sfp-bus.c | 35 +++- drivers/net/tun.c | 2 drivers/net/usb/asix_devices.c | 4 drivers/net/usb/lan78xx.c | 5 - drivers/net/usb/qmi_wwan.c | 1 drivers/net/usb/rtl8150.c | 2 drivers/net/usb/smsc75xx.c | 62 +++++++ drivers/net/wireless/ath/ath10k/mac.c | 16 +- drivers/net/wireless/ath/ath10k/wmi.h | 1 drivers/net/wireless/ath/wcn36xx/testmode.c | 2 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 + drivers/net/wireless/marvell/mwifiex/usb.c | 7 - drivers/net/wireless/mediatek/mt7601u/phy.c | 6 - drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 drivers/net/wireless/realtek/rtlwifi/base.c | 17 +- drivers/net/wireless/realtek/rtlwifi/base.h | 2 drivers/net/wireless/realtek/rtlwifi/core.c | 3 drivers/net/wireless/realtek/rtlwifi/pci.c | 2 drivers/net/wireless/realtek/rtlwifi/ps.c | 4 drivers/net/wireless/realtek/rtlwifi/usb.c | 2 drivers/nvme/host/core.c | 63 ++++--- drivers/nvme/host/pci.c | 12 + drivers/of/base.c | 6 - drivers/of/of_private.h | 2 drivers/of/overlay.c | 11 + drivers/pci/controller/dwc/pcie-designware-host.c | 3 drivers/pci/controller/pci-aardvark.c | 2 drivers/pci/controller/pci-ftpci100.c | 2 drivers/pci/controller/pci-hyperv.c | 8 + drivers/pci/controller/pci-v3-semi.c | 2 drivers/pci/controller/pci-versatile.c | 2 drivers/pci/controller/pci-xgene.c | 2 drivers/pci/controller/pcie-mediatek.c | 2 drivers/pci/endpoint/pci-epf-core.c | 62 +++++-- drivers/pci/of.c | 2 drivers/pci/pci.c | 38 ++++ drivers/platform/x86/dell-laptop.c | 2 drivers/ptp/ptp_chardev.c | 1 drivers/scsi/cxlflash/main.h | 4 drivers/scsi/cxlflash/ocxl_hw.c | 5 - drivers/scsi/hpsa.c | 25 ++- drivers/scsi/hpsa.h | 1 drivers/scsi/qedf/qedf_main.c | 12 + drivers/scsi/qedi/qedi_main.c | 11 + drivers/scsi/qla2xxx/qla_def.h | 2 drivers/scsi/qla2xxx/qla_gs.c | 40 +++- drivers/scsi/qla2xxx/qla_init.c | 14 + drivers/scsi/qla2xxx/qla_os.c | 4 drivers/scsi/sd_zbc.c | 5 - drivers/soc/imx/gpc.c | 21 ++ drivers/vfio/pci/vfio_pci.c | 4 drivers/vfio/vfio_iommu_spapr_tce.c | 10 + fs/aio.c | 5 + fs/btrfs/extent_io.c | 7 + fs/btrfs/ioctl.c | 2 fs/btrfs/scrub.c | 17 +- fs/btrfs/volumes.c | 2 fs/exec.c | 6 - fs/fat/inode.c | 20 +- fs/internal.h | 1 include/linux/bpf-cgroup.h | 1 include/linux/filter.h | 6 - include/linux/fs.h | 1 include/linux/fsl/guts.h | 1 include/linux/if_bridge.h | 4 include/linux/igmp.h | 2 include/linux/intel-iommu.h | 1 include/linux/marvell_phy.h | 2 include/linux/mm.h | 4 include/linux/pci.h | 2 include/linux/sched/task.h | 2 include/linux/skbuff.h | 10 + include/linux/syscalls.h | 1 include/net/ip6_route.h | 6 + include/net/ipv6.h | 13 - include/net/netfilter/nf_tables_core.h | 6 + include/net/netfilter/nf_tproxy.h | 4 include/net/tc_act/tc_csum.h | 1 include/net/tc_act/tc_tunnel_key.h | 1 include/net/tcp.h | 6 - include/net/xdp_sock.h | 4 include/uapi/linux/aio_abi.h | 6 - include/uapi/linux/ethtool.h | 2 include/uapi/linux/tcp.h | 4 kernel/bpf/btf.c | 30 +-- kernel/bpf/devmap.c | 7 + kernel/bpf/hashtab.c | 16 +- kernel/bpf/sockmap.c | 43 +++-- kernel/bpf/syscall.c | 4 kernel/bpf/verifier.c | 11 + kernel/fork.c | 35 +++- kernel/sched/deadline.c | 11 + kernel/softirq.c | 12 + kernel/stop_machine.c | 6 + lib/iov_iter.c | 77 ++++++++ lib/rhashtable.c | 27 ++- mm/huge_memory.c | 2 mm/memblock.c | 3 mm/memcontrol.c | 2 mm/mmap.c | 35 +--- mm/nommu.c | 10 - net/batman-adv/bat_iv_ogm.c | 4 net/batman-adv/bat_v.c | 4 net/batman-adv/debugfs.c | 40 ++++ net/batman-adv/debugfs.h | 11 + net/batman-adv/hard-interface.c | 37 +++- net/batman-adv/translation-table.c | 7 + net/bpf/test_run.c | 17 +- net/core/filter.c | 149 +++++++++++++--- net/core/gen_stats.c | 16 +- net/core/skbuff.c | 1 net/dns_resolver/dns_key.c | 28 ++- net/ieee802154/6lowpan/core.c | 6 + net/ipv4/fib_frontend.c | 1 net/ipv4/igmp.c | 58 ++++-- net/ipv4/inet_fragment.c | 2 net/ipv4/ip_sockglue.c | 4 net/ipv4/netfilter/ip_tables.c | 1 net/ipv4/netfilter/nf_tproxy_ipv4.c | 18 +- net/ipv4/sysctl_net_ipv4.c | 5 - net/ipv4/tcp.c | 16 +- net/ipv4/tcp_dctcp.c | 31 --- net/ipv4/tcp_ipv4.c | 23 ++ net/ipv4/tcp_output.c | 4 net/ipv6/Kconfig | 1 net/ipv6/calipso.c | 9 - net/ipv6/exthdrs.c | 111 +++--------- net/ipv6/ip6_fib.c | 156 +++++++++-------- net/ipv6/ip6_gre.c | 3 net/ipv6/ipv6_sockglue.c | 32 ++- net/ipv6/mcast.c | 64 +++++-- net/ipv6/ndisc.c | 2 net/ipv6/netfilter/ip6_tables.c | 1 net/ipv6/netfilter/nf_conntrack_reasm.c | 2 net/ipv6/netfilter/nf_tproxy_ipv6.c | 18 +- net/ipv6/route.c | 10 + net/ipv6/seg6_iptunnel.c | 2 net/netfilter/Kconfig | 25 +-- net/netfilter/Makefile | 7 - net/netfilter/nf_conntrack_core.c | 2 net/netfilter/nf_tables_set_core.c | 28 +++ net/netfilter/nft_compat.c | 13 + net/netfilter/nft_set_bitmap.c | 19 -- net/netfilter/nft_set_hash.c | 29 --- net/netfilter/nft_set_rbtree.c | 19 -- net/netfilter/xt_TPROXY.c | 8 - net/nfc/llcp_commands.c | 9 + net/nsh/nsh.c | 2 net/packet/af_packet.c | 2 net/qrtr/qrtr.c | 13 + net/sched/act_csum.c | 6 - net/sched/act_tunnel_key.c | 6 - net/sched/cls_api.c | 4 net/sched/sch_fq_codel.c | 25 ++- net/sctp/transport.c | 2 net/smc/af_smc.c | 37 +++- net/smc/smc_clc.c | 3 net/smc/smc_close.c | 2 net/smc/smc_tx.c | 12 + net/tipc/discover.c | 18 +- net/tipc/net.c | 17 +- net/tipc/node.c | 7 + net/tls/tls_sw.c | 7 + net/xdp/xsk.c | 30 +-- net/xdp/xsk_queue.h | 9 - samples/bpf/.gitignore | 49 +++++ samples/bpf/parse_varlen.c | 6 - samples/bpf/test_overhead_user.c | 19 ++ samples/bpf/trace_event_user.c | 27 +++ samples/bpf/xdp2skb_meta.sh | 6 - samples/bpf/xdpsock_user.c | 2 scripts/tags.sh | 1 sound/core/rawmidi.c | 20 +- sound/pci/hda/patch_conexant.c | 1 sound/pci/hda/patch_realtek.c | 2 tools/objtool/elf.c | 6 - tools/testing/selftests/bpf/test_verifier.c | 23 ++ tools/testing/selftests/net/fib_tests.sh | 41 ---- tools/testing/selftests/net/udpgso_bench.sh | 3 virt/kvm/eventfd.c | 17 +- 327 files changed, 2794 insertions(+), 1633 deletions(-)