Merge tag 'v4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994634AbdGCBIr3CM40/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jul 3 02:28:18 2017 +0200 Commit: 17dbb8ddabfcc6ae47d170071def024db34a9096 Gitweb: https://git.linux-mips.org/g/ralf/linux/17dbb8ddabfc Branch: master --- Documentation/admin-guide/kernel-parameters.txt | 7 Documentation/networking/scaling.txt | 2 Makefile | 2 arch/arc/mm/mmap.c | 2 arch/arm/boot/dts/am335x-sl50.dts | 8 arch/arm/boot/dts/sunxi-h3-h5.dtsi | 7 arch/arm/mm/mmap.c | 4 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 5 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 arch/arm64/net/bpf_jit_comp.c | 7 arch/frv/mm/elf-fdpic.c | 2 arch/mips/boot/Makefile | 10 arch/mips/include/asm/highmem.h | 5 arch/mips/include/asm/pgtable-32.h | 7 arch/mips/kernel/branch.c | 4 arch/mips/kernel/ftrace.c | 24 - arch/mips/kernel/perf_event_mipsxx.c | 6 arch/mips/mm/mmap.c | 2 arch/mips/mm/pgtable-32.c | 6 arch/parisc/kernel/sys_parisc.c | 15 - arch/powerpc/include/asm/bug.h | 2 arch/powerpc/include/asm/xive.h | 12 - arch/powerpc/kvm/book3s_xive_template.c | 4 arch/powerpc/mm/hugetlbpage-radix.c | 2 arch/powerpc/mm/mmap.c | 4 arch/powerpc/mm/slice.c | 2 arch/powerpc/platforms/powernv/npu-dma.c | 3 arch/powerpc/sysdev/xive/common.c | 2 arch/s390/configs/default_defconfig | 39 +- arch/s390/configs/gcov_defconfig | 28 + arch/s390/configs/performance_defconfig | 27 + arch/s390/configs/zfcpdump_defconfig | 6 arch/s390/defconfig | 8 arch/s390/kernel/entry.S | 19 + arch/s390/mm/mmap.c | 4 arch/sh/mm/mmap.c | 4 arch/sparc/kernel/sys_sparc_64.c | 4 arch/sparc/mm/hugetlbpage.c | 2 arch/tile/mm/hugetlbpage.c | 2 arch/x86/include/asm/extable.h | 1 arch/x86/kernel/sys_x86_64.c | 4 arch/x86/kernel/traps.c | 2 arch/x86/mm/extable.c | 3 arch/x86/mm/hugetlbpage.c | 2 arch/x86/mm/init.c | 6 arch/xtensa/include/asm/irq.h | 3 arch/xtensa/kernel/irq.c | 5 arch/xtensa/kernel/setup.c | 3 arch/xtensa/kernel/syscall.c | 2 arch/xtensa/kernel/vmlinux.lds.S | 6 arch/xtensa/platforms/iss/simdisk.c | 3 .../platforms/xtfpga/include/platform/hardware.h | 6 arch/xtensa/platforms/xtfpga/setup.c | 10 block/blk-sysfs.c | 34 + drivers/acpi/acpica/tbutils.c | 34 + drivers/acpi/acpica/utresrc.c | 9 drivers/cpufreq/cpufreq_conservative.c | 4 drivers/cpuidle/dt_idle_states.c | 4 drivers/devfreq/event/exynos-nocp.c | 6 drivers/devfreq/event/exynos-ppmu.c | 8 drivers/firmware/dmi-id.c | 4 drivers/firmware/dmi_scan.c | 49 ++ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 7 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 7 drivers/gpu/drm/bridge/synopsys/Kconfig | 1 drivers/gpu/drm/i915/i915_pvinfo.h | 8 drivers/gpu/drm/i915/i915_vgpu.c | 10 drivers/gpu/drm/i915/intel_display.c | 14 - drivers/gpu/drm/i915/intel_pm.c | 36 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 9 drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 42 ++ drivers/gpu/drm/radeon/cik.c | 7 drivers/gpu/drm/radeon/evergreen.c | 7 drivers/gpu/drm/radeon/radeon_uvd.c | 2 drivers/gpu/drm/radeon/si.c | 7 drivers/gpu/drm/tegra/drm.c | 22 - drivers/gpu/host1x/dev.c | 2 drivers/hid/hid-core.c | 282 +++++++++--- drivers/hsi/clients/ssi_protocol.c | 2 drivers/i2c/busses/i2c-ismt.c | 2 drivers/i2c/busses/i2c-rcar.c | 2 drivers/iio/adc/meson_saradc.c | 4 drivers/iio/adc/mxs-lradc-adc.c | 7 drivers/iio/buffer/industrialio-buffer-dma.c | 1 drivers/iio/buffer/industrialio-buffer-dmaengine.c | 1 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 39 ++ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 drivers/infiniband/core/addr.c | 10 drivers/infiniband/hw/bnxt_re/bnxt_re.h | 4 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 471 +++++++++++++++----- drivers/infiniband/hw/bnxt_re/ib_verbs.h | 22 + drivers/infiniband/hw/bnxt_re/main.c | 4 drivers/infiniband/hw/bnxt_re/qplib_fp.c | 384 ++++++++-------- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 18 + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 314 +++++++------ drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 61 +-- drivers/infiniband/hw/bnxt_re/qplib_res.h | 4 drivers/infiniband/hw/bnxt_re/qplib_sp.c | 333 ++++---------- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 drivers/infiniband/hw/cxgb4/device.c | 10 drivers/infiniband/hw/mlx5/main.c | 6 drivers/infiniband/hw/qedr/qedr.h | 5 drivers/infiniband/hw/qedr/verbs.c | 68 ++- drivers/infiniband/sw/rxe/rxe.h | 5 drivers/infiniband/sw/rxe/rxe_verbs.c | 9 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 drivers/infiniband/ulp/ipoib/ipoib_main.c | 15 + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 11 drivers/irqchip/irq-xtensa-mx.c | 2 drivers/irqchip/irq-xtensa-pic.c | 2 drivers/leds/leds-bcm6328.c | 4 drivers/leds/trigger/ledtrig-heartbeat.c | 31 - drivers/media/cec/Kconfig | 1 drivers/media/cec/cec-api.c | 8 drivers/media/i2c/tc358743.c | 2 drivers/media/rc/sir_ir.c | 6 drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 1 drivers/media/v4l2-core/videobuf2-core.c | 2 drivers/mmc/host/meson-gx-mmc.c | 9 drivers/net/bonding/bond_3ad.c | 27 + drivers/net/bonding/bond_main.c | 6 drivers/net/caif/caif_hsi.c | 2 drivers/net/caif/caif_serial.c | 2 drivers/net/caif/caif_spi.c | 2 drivers/net/caif/caif_virtio.c | 2 drivers/net/can/dev.c | 3 drivers/net/can/peak_canfd/peak_canfd.c | 2 drivers/net/can/slcan.c | 7 drivers/net/can/usb/gs_usb.c | 2 drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 drivers/net/can/vcan.c | 4 drivers/net/can/vxcan.c | 4 drivers/net/dummy.c | 4 drivers/net/ethernet/amazon/ena/ena_com.c | 35 + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 2 drivers/net/ethernet/amazon/ena/ena_netdev.c | 179 ++++++-- drivers/net/ethernet/amazon/ena/ena_netdev.h | 18 + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 19 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 15 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 drivers/net/ethernet/ibm/emac/core.c | 67 ++- drivers/net/ethernet/ibm/ibmvnic.c | 6 drivers/net/ethernet/intel/i40e/i40e.h | 1 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 drivers/net/ethernet/intel/i40e/i40e_main.c | 7 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 drivers/net/ethernet/marvell/mvpp2.c | 76 +-- drivers/net/ethernet/mellanox/mlx5/core/en.h | 8 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 45 +- drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 11 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 drivers/net/ethernet/mellanox/mlx5/core/health.c | 11 drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 11 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 3 drivers/net/geneve.c | 2 drivers/net/gtp.c | 2 drivers/net/hamradio/6pack.c | 2 drivers/net/hamradio/bpqether.c | 2 drivers/net/hyperv/hyperv_net.h | 5 drivers/net/hyperv/netvsc_drv.c | 54 +- drivers/net/hyperv/rndis_filter.c | 30 + drivers/net/ifb.c | 4 drivers/net/ipvlan/ipvlan_main.c | 2 drivers/net/loopback.c | 4 drivers/net/macsec.c | 4 drivers/net/macvlan.c | 2 drivers/net/netconsole.c | 2 drivers/net/nlmon.c | 2 drivers/net/phy/Kconfig | 1 drivers/net/phy/phy.c | 2 drivers/net/slip/slip.c | 7 drivers/net/team/team.c | 4 drivers/net/tun.c | 4 drivers/net/usb/cdc-phonet.c | 2 drivers/net/usb/qmi_wwan.c | 6 drivers/net/usb/r8152.c | 2 drivers/net/veth.c | 4 drivers/net/vrf.c | 38 +- drivers/net/vsockmon.c | 2 drivers/net/vxlan.c | 2 drivers/net/wan/dlci.c | 2 drivers/net/wan/hdlc_fr.c | 2 drivers/net/wan/lapbether.c | 2 drivers/net/wireless/ath/ath6kl/main.c | 2 .../broadcom/brcm80211/brcmfmac/cfg80211.c | 1 .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 drivers/net/wireless/intersil/hostap/hostap_main.c | 2 drivers/net/wireless/mac80211_hwsim.c | 2 drivers/net/wireless/marvell/mwifiex/main.c | 2 drivers/pci/access.c | 12 - drivers/pci/endpoint/functions/Kconfig | 1 drivers/platform/x86/intel_telemetry_debugfs.c | 16 - drivers/s390/cio/vfio_ccw_ops.c | 12 - drivers/s390/crypto/ap_bus.c | 38 +- drivers/s390/crypto/ap_card.c | 9 drivers/s390/crypto/ap_queue.c | 9 drivers/s390/net/netiucv.c | 4 drivers/staging/iio/cdc/ad7152.c | 6 drivers/staging/rtl8188eu/os_dep/mon.c | 2 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 drivers/staging/rtl8723bs/os_dep/osdep_service.c | 2 drivers/usb/gadget/composite.c | 11 drivers/usb/gadget/function/f_phonet.c | 2 drivers/usb/gadget/legacy/inode.c | 9 drivers/usb/gadget/udc/dummy_hcd.c | 13 - drivers/usb/gadget/udc/net2280.c | 9 drivers/usb/host/xhci-mem.c | 7 drivers/usb/host/xhci-pci.c | 3 drivers/video/fbdev/core/fbmon.c | 2 drivers/video/fbdev/smscufx.c | 5 drivers/video/fbdev/udlfb.c | 9 drivers/video/fbdev/via/viafbdev.c | 8 drivers/virtio/virtio_balloon.c | 7 fs/btrfs/hash.c | 5 fs/ceph/acl.c | 1 fs/ceph/export.c | 4 fs/ceph/inode.c | 5 fs/ceph/mds_client.c | 4 fs/configfs/item.c | 8 fs/configfs/symlink.c | 3 fs/dcache.c | 10 fs/f2fs/f2fs.h | 5 fs/hugetlbfs/inode.c | 2 fs/namespace.c | 2 fs/proc/task_mmu.c | 4 fs/read_write.c | 2 fs/ufs/balloc.c | 22 + fs/ufs/inode.c | 47 +- fs/ufs/super.c | 64 ++- fs/ufs/ufs_fs.h | 7 fs/ufs/util.c | 17 - fs/ufs/util.h | 9 fs/userfaultfd.c | 29 + fs/xfs/xfs_buf.c | 2 fs/xfs/xfs_icache.c | 5 include/acpi/actbl.h | 14 + include/linux/blkdev.h | 2 include/linux/configfs.h | 3 include/linux/dmi.h | 2 include/linux/mm.h | 53 +- include/linux/netdevice.h | 15 - include/media/cec-notifier.h | 10 include/media/cec.h | 2 include/uapi/linux/ethtool.h | 6 include/uapi/linux/openvswitch.h | 1 kernel/irq/manage.c | 4 kernel/sched/core.c | 2 kernel/sched/cpufreq_schedutil.c | 3 kernel/sched/fair.c | 2 kernel/time/alarmtimer.c | 14 - kernel/time/tick-broadcast.c | 4 kernel/time/tick-internal.h | 2 lib/libcrc32c.c | 6 mm/gup.c | 5 mm/huge_memory.c | 8 mm/memory-failure.c | 5 mm/memory.c | 38 -- mm/mmap.c | 149 ++++-- mm/swap_cgroup.c | 3 mm/vmpressure.c | 6 net/8021q/vlan_dev.c | 4 net/batman-adv/distributed-arp-table.c | 5 net/batman-adv/routing.c | 2 net/batman-adv/soft-interface.c | 5 net/bluetooth/6lowpan.c | 2 net/bridge/br_device.c | 2 net/caif/caif_socket.c | 4 net/caif/cfpkt_skbuff.c | 6 net/caif/chnl_net.c | 4 net/can/af_can.c | 3 net/core/dev.c | 42 +- net/core/dst.c | 14 + net/core/rtnetlink.c | 3 net/decnet/netfilter/dn_rtmsg.c | 4 net/hsr/hsr_device.c | 4 net/hsr/hsr_forward.c | 3 net/hsr/hsr_framereg.c | 9 net/hsr/hsr_framereg.h | 2 net/ieee802154/6lowpan/core.c | 2 net/ipv4/icmp.c | 8 net/ipv4/igmp.c | 21 + net/ipv4/ip_tunnel.c | 4 net/ipv4/ipmr.c | 34 + net/ipv6/icmp.c | 2 net/ipv6/ila/ila_xlat.c | 1 net/ipv6/ip6_gre.c | 9 net/ipv6/ip6_tunnel.c | 8 net/ipv6/ip6_vti.c | 8 net/ipv6/ip6mr.c | 2 net/ipv6/proc.c | 2 net/ipv6/route.c | 1 net/ipv6/sit.c | 6 net/irda/irlan/irlan_eth.c | 2 net/l2tp/l2tp_eth.c | 15 - net/mac80211/cfg.c | 2 net/mac80211/ieee80211_i.h | 2 net/mac80211/iface.c | 7 net/mac80211/mlme.c | 62 +-- net/mac80211/rx.c | 6 net/mac80211/wpa.c | 9 net/mac802154/iface.c | 7 net/openvswitch/vport-internal_dev.c | 4 net/phonet/pep-gprs.c | 2 net/sched/act_pedit.c | 4 net/sched/act_police.c | 8 net/sctp/socket.c | 4 net/tipc/msg.c | 2 net/unix/af_unix.c | 7 security/selinux/hooks.c | 5 tools/objtool/builtin-check.c | 3 tools/perf/Makefile.config | 38 +- tools/perf/Makefile.perf | 2 tools/perf/arch/Build | 2 tools/perf/pmu-events/Build | 4 tools/perf/tests/Build | 2 tools/perf/tests/task-exit.c | 2 tools/perf/util/evsel.c | 12 + tools/perf/util/header.c | 2 tools/perf/util/unwind-libdw.c | 8 tools/testing/selftests/bpf/bpf_endian.h | 41 +- 330 files changed, 2988 insertions(+), 2037 deletions(-)