Merge tag 'v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:49:36 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993065AbeEOMtjgCtH0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:33:56 2018 +0200 Commit: eff1cb067f52dd5c8ad75d12bcb59031ede35705 Gitweb: https://git.linux-mips.org/g/ralf/linux/eff1cb067f52 Branch: master --- .mailmap | 1 Documentation/isdn/INTERFACE.CAPI | 2 Documentation/isdn/README | 4 Documentation/isdn/README.FAQ | 4 Documentation/isdn/README.gigaset | 16 +- MAINTAINERS | 39 +++-- Makefile | 6 - arch/arm/Kconfig.debug | 1 arch/arm/boot/deflate_xip_data.sh | 6 - arch/arm/boot/dts/aspeed-g4.dtsi | 5 + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + arch/arm/boot/dts/imx7d-sdb.dts | 2 arch/arm/boot/dts/rk3288.dtsi | 2 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 63 +++++++ arch/arm/include/asm/vdso.h | 2 arch/arm/kernel/vdso.c | 12 + arch/arm/mach-davinci/board-omapl138-hawk.c | 4 arch/arm/mach-ux500/cpu-db8500.c | 3 arch/arm/plat-omap/dmtimer.c | 7 - arch/arm/plat-omap/include/plat/sram.h | 11 - arch/arm/plat-omap/sram.c | 36 ++++ arch/arm/vfp/vfpmodule.c | 2 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 16 -- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 - arch/powerpc/include/asm/book3s/64/mmu.h | 3 .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 3 arch/powerpc/include/asm/cputable.h | 3 arch/powerpc/include/asm/mmu_context.h | 18 ++ arch/powerpc/kernel/dt_cpu_ftrs.c | 6 + arch/powerpc/kernel/exceptions-64s.S | 2 arch/powerpc/kernel/irq.c | 8 + arch/powerpc/kvm/book3s_64_mmu_radix.c | 3 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 11 + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 35 ++-- arch/powerpc/mm/hash_native_64.c | 16 ++ arch/powerpc/mm/mmu_context_book3s64.c | 1 arch/powerpc/mm/pgtable_64.c | 1 arch/powerpc/mm/tlb-radix.c | 169 +++++++++++--------- arch/x86/events/intel/ds.c | 25 ++- arch/x86/include/asm/alternative.h | 4 arch/x86/include/asm/hw_irq.h | 1 arch/x86/include/asm/uv/uv_mmrs.h | 2 arch/x86/kernel/idt.c | 3 arch/x86/kernel/kvm.c | 4 arch/x86/kvm/vmx.c | 10 + arch/x86/platform/uv/tlb_uv.c | 2 arch/x86/purgatory/Makefile | 2 drivers/atm/iphase.c | 2 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 20 ++ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 drivers/gpu/drm/tegra/dc.c | 6 - drivers/i2c/busses/i2c-stm32f7.c | 5 + drivers/infiniband/core/addr.c | 25 +++ drivers/infiniband/core/device.c | 3 drivers/infiniband/core/ucma.c | 47 +++--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 drivers/infiniband/hw/mlx5/main.c | 12 + drivers/infiniband/hw/mlx5/mr.c | 3 drivers/infiniband/hw/qedr/main.c | 3 drivers/infiniband/hw/qedr/verbs.c | 45 ++++- drivers/md/dm-mpath.c | 2 drivers/md/dm.c | 8 + drivers/mtd/chips/jedec_probe.c | 2 drivers/mtd/nand/atmel/pmecc.c | 2 drivers/net/bonding/bond_main.c | 73 ++++----- drivers/net/dsa/mt7530.c | 2 drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 72 +++++---- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 33 ++-- drivers/net/ethernet/mellanox/mlx4/en_main.c | 4 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 1 drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 17 ++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 34 ++-- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 18 +- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 78 ++++++--- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 6 + drivers/net/ethernet/qlogic/qede/qede_fp.c | 20 +- drivers/net/ethernet/realtek/r8169.c | 4 drivers/net/hyperv/rndis_filter.c | 2 drivers/net/team/team.c | 12 + drivers/net/usb/lan78xx.c | 33 ++++ drivers/net/usb/qmi_wwan.c | 5 + drivers/net/vrf.c | 5 - .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 .../wireless/broadcom/brcm80211/brcmfmac/common.c | 5 + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 1 .../wireless/broadcom/brcm80211/brcmfmac/core.c | 57 +++++++ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 62 +++++++ drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 21 ++ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 74 ++++----- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 15 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 10 - drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 38 ++-- drivers/scsi/hosts.c | 1 drivers/scsi/hpsa.c | 73 ++++++--- drivers/scsi/hpsa.h | 1 drivers/scsi/ibmvscsi/ibmvfc.c | 6 - drivers/scsi/iscsi_tcp.c | 8 + drivers/scsi/megaraid/megaraid_sas.h | 1 drivers/scsi/megaraid/megaraid_sas_base.c | 39 ++++- drivers/scsi/megaraid/megaraid_sas_fusion.c | 12 - drivers/scsi/sd.c | 2 drivers/scsi/virtio_scsi.c | 129 ++------------- drivers/vhost/net.c | 4 drivers/vhost/vhost.c | 17 +- fs/ceph/file.c | 9 + include/linux/if_vlan.h | 15 ++ include/linux/net_dim.h | 2 include/net/llc_conn.h | 2 include/net/netfilter/nf_tables.h | 4 include/net/sch_generic.h | 1 include/rdma/ib_addr.h | 2 include/scsi/scsi_host.h | 3 ipc/shm.c | 12 + kernel/events/hw_breakpoint.c | 30 +--- mm/kmemleak.c | 12 + mm/memcontrol.c | 6 - mm/page_owner.c | 6 - mm/slab.c | 1 mm/vmstat.c | 2 net/batman-adv/gateway_client.c | 5 - net/batman-adv/multicast.c | 4 net/core/dev.c | 2 net/core/skbuff.c | 6 - net/ipv4/ip_tunnel.c | 31 +++- net/ipv4/ip_vti.c | 2 net/ipv4/netfilter/Makefile | 2 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 14 ++ net/ipv4/netfilter/nf_socket_ipv4.c | 6 - net/ipv4/syncookies.c | 2 net/ipv4/tcp_input.c | 3 net/ipv6/ip6_output.c | 13 +- net/ipv6/ip6_vti.c | 36 +++- net/ipv6/netfilter/nf_socket_ipv6.c | 6 - net/ipv6/route.c | 16 +- net/ipv6/seg6_iptunnel.c | 16 +- net/ipv6/syncookies.c | 2 net/llc/llc_c_ac.c | 15 +- net/llc/llc_conn.c | 32 +++- net/netfilter/nf_tables_api.c | 106 ++++++++++--- net/netfilter/nft_set_hash.c | 2 net/netlink/af_netlink.c | 3 net/sched/act_api.c | 4 net/sched/sch_generic.c | 17 ++ net/smc/smc_clc.c | 2 net/strparser/strparser.c | 4 net/xfrm/xfrm_input.c | 6 + net/xfrm/xfrm_output.c | 5 - scripts/adjust_autoksyms.sh | 7 + scripts/package/builddeb | 2 scripts/package/mkspec | 2 sound/core/oss/pcm_oss.c | 4 sound/core/pcm_native.c | 2 sound/usb/quirks.c | 1 tools/bpf/bpftool/map.c | 2 tools/objtool/check.c | 11 + 163 files changed, 1490 insertions(+), 824 deletions(-)