Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993967AbdHGIBGoakCy/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 4 16:08:45 2017 +0200 Commit: 03fda489866710ceac5228753232e8e46dbf1ee6 Gitweb: https://git.linux-mips.org/g/ralf/linux/03fda4898667 Branch: master --- Documentation/admin-guide/pm/cpufreq.rst | 8 + .../devicetree/bindings/ata/sata_rcar.txt | 14 + Documentation/power/runtime_pm.txt | 3 MAINTAINERS | 14 + arch/parisc/Kconfig | 3 arch/parisc/include/asm/thread_info.h | 2 arch/parisc/kernel/cache.c | 5 arch/parisc/kernel/irq.c | 2 arch/x86/kernel/cpu/aperfmperf.c | 40 ++-- drivers/acpi/acpi_apd.c | 4 drivers/acpi/acpi_lpss.c | 14 + drivers/acpi/acpi_watchdog.c | 7 + drivers/ata/Kconfig | 4 drivers/ata/libata-core.c | 6 - drivers/ata/libata-eh.c | 7 - drivers/ata/libata-scsi.c | 6 - drivers/ata/sata_rcar.c | 8 + drivers/cpufreq/intel_pstate.c | 8 - drivers/isdn/i4l/isdn_common.c | 1 drivers/isdn/i4l/isdn_net.c | 5 drivers/mailbox/pcc.c | 2 drivers/net/bonding/bond_main.c | 2 drivers/net/ethernet/aurora/nb8800.c | 9 - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 drivers/net/ethernet/broadcom/genet/bcmmii.c | 7 - drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 27 ++ drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 2 drivers/net/ethernet/faraday/ftgmac100.c | 7 - drivers/net/ethernet/marvell/mv643xx_eth.c | 2 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 5 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 25 ++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 222 ++++++++++++++------ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 4 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 16 + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 25 +- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 5 .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 3 .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 5 drivers/net/ethernet/sun/sunhme.h | 6 - drivers/net/ethernet/toshiba/tc35815.c | 2 drivers/net/hyperv/netvsc_drv.c | 43 +++- drivers/net/irda/mcs7780.c | 16 + drivers/net/phy/Kconfig | 13 + drivers/net/phy/phy.c | 3 drivers/net/ppp/pptp.c | 2 drivers/net/team/team.c | 8 - drivers/net/tun.c | 10 + drivers/net/virtio_net.c | 5 .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 8 - drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h | 4 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 - drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 15 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 3 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 3 drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 drivers/parisc/pdc_stable.c | 6 - drivers/phy/broadcom/Kconfig | 2 drivers/platform/x86/Kconfig | 1 drivers/platform/x86/dell-wmi.c | 12 + drivers/platform/x86/wmi.c | 6 - drivers/scsi/Kconfig | 2 drivers/scsi/aic7xxx/Makefile | 12 + drivers/scsi/aic7xxx/aicasm/Makefile | 53 +++-- drivers/scsi/cxgbi/libcxgbi.c | 7 + drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 - drivers/scsi/qedi/Kconfig | 1 drivers/scsi/qedi/qedi_iscsi.c | 8 - drivers/scsi/scsi_transport_fc.c | 6 - drivers/thunderbolt/icm.c | 9 + drivers/vfio/pci/vfio_pci.c | 9 + drivers/vfio/pci/vfio_pci_config.c | 13 + drivers/vhost/vhost.c | 28 +-- drivers/vhost/vhost.h | 3 fs/nfs/nfs4client.c | 3 fs/nfs/nfs4proc.c | 27 +- fs/nfs/nfs4xdr.c | 2 fs/ocfs2/acl.c | 24 +- fs/userfaultfd.c | 5 include/linux/cpuset.h | 19 ++ include/linux/ipv6.h | 6 + include/linux/kthread.h | 2 include/linux/libata.h | 2 include/linux/mlx5/mlx5_ifc.h | 10 + include/linux/mm_types.h | 4 include/linux/nfs_xdr.h | 2 include/linux/pagemap.h | 2 include/linux/phy.h | 2 include/linux/vfio.h | 4 include/linux/workqueue.h | 4 include/net/sctp/sctp.h | 4 include/net/udp.h | 34 ++- ipc/msg.c | 3 ipc/sem.c | 3 ipc/shm.c | 4 kernel/bpf/syscall.c | 4 kernel/bpf/verifier.c | 21 +- kernel/cgroup/cgroup-internal.h | 3 kernel/cgroup/cgroup.c | 66 +++--- kernel/cgroup/cpuset.c | 1 kernel/pid.c | 3 kernel/workqueue.c | 30 ++- lib/test_rhashtable.c | 57 +++-- mm/hugetlb.c | 9 - mm/internal.h | 5 mm/kasan/report.c | 1 mm/madvise.c | 1 mm/memory.c | 1 mm/mprotect.c | 1 mm/mremap.c | 8 + mm/page_alloc.c | 2 mm/page_io.c | 7 + mm/rmap.c | 36 +++ mm/zsmalloc.c | 1 net/core/dev_ioctl.c | 2 net/core/netpoll.c | 2 net/dccp/feat.c | 7 - net/dccp/ipv4.c | 1 net/dccp/ipv6.c | 1 net/dsa/dsa2.c | 13 + net/ipv4/fib_semantics.c | 2 net/ipv4/tcp_output.c | 5 net/ipv4/udp.c | 41 ++-- net/ipv6/exthdrs.c | 1 net/ipv6/ip6_output.c | 4 net/ipv6/udp.c | 38 +++ net/openvswitch/conntrack.c | 7 - net/packet/af_packet.c | 2 net/socket.c | 5 samples/bpf/tcbpf2_kern.c | 4 samples/bpf/test_tunnel_bpf.sh | 1 tools/lib/bpf/bpf.c | 1 tools/testing/selftests/bpf/test_progs.c | 8 + tools/testing/selftests/bpf/test_verifier.c | 28 +++ 147 files changed, 1016 insertions(+), 494 deletions(-)