Merge tag 'v4.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 15 May 2018 14:51:54 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993514AbeEOMv4rTro0/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 14:37:42 2018 +0200 Commit: 69c7d71e6d7c587e94f8afc1ec0b610f107a1ede Gitweb: https://git.linux-mips.org/g/ralf/linux/69c7d71e6d7c Branch: master --- Documentation/admin-guide/pm/intel_pstate.rst | 2 Documentation/admin-guide/pm/sleep-states.rst | 2 Documentation/device-mapper/thin-provisioning.txt | 5 .../devicetree/bindings/ata/ahci-platform.txt | 1 .../bindings/display/panel/panel-common.txt | 2 .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 .../devicetree/bindings/net/can/rcar_canfd.txt | 4 .../devicetree/bindings/net/renesas,ravb.txt | 1 .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 - .../bindings/serial/renesas,sci-serial.txt | 2 .../devicetree/bindings/vendor-prefixes.txt | 1 Documentation/devicetree/overlay-notes.txt | 8 + MAINTAINERS | 9 - Makefile | 2 arch/Kconfig | 4 arch/arm/boot/dts/imx35.dtsi | 4 arch/arm/boot/dts/imx53.dtsi | 4 arch/arm64/include/asm/cputype.h | 6 + arch/arm64/kernel/cpu_errata.c | 1 arch/arm64/mm/init.c | 4 arch/powerpc/include/asm/ftrace.h | 29 ++- arch/powerpc/include/asm/paca.h | 1 arch/powerpc/include/asm/topology.h | 13 - arch/sh/Kconfig | 1 arch/sh/kernel/cpu/sh2/probe.c | 4 arch/sh/kernel/setup.c | 1 arch/sh/mm/consistent.c | 11 + arch/sh/mm/init.c | 68 +------ arch/sh/mm/numa.c | 19 -- arch/x86/entry/vdso/vdso32/vdso-fakesections.c | 1 arch/x86/events/core.c | 8 + arch/x86/events/intel/cstate.c | 2 arch/x86/events/msr.c | 9 + arch/x86/xen/enlighten_hvm.c | 13 + drivers/ata/ahci.c | 6 - drivers/ata/ahci.h | 8 + drivers/ata/ahci_mvebu.c | 56 +++++ drivers/ata/ahci_qoriq.c | 2 drivers/ata/ahci_xgene.c | 4 drivers/ata/libahci.c | 20 +- drivers/ata/libahci_platform.c | 24 -- drivers/ata/libata-core.c | 6 + drivers/ata/libata-eh.c | 4 drivers/ata/sata_highbank.c | 2 drivers/ata/sata_sil24.c | 4 drivers/atm/firestream.c | 2 drivers/atm/zatm.c | 3 drivers/block/rbd.c | 4 drivers/bluetooth/btusb.c | 19 +- drivers/char/agp/uninorth-agp.c | 4 drivers/gpio/gpio-aspeed.c | 2 drivers/gpio/gpio-pci-idio-16.c | 8 - drivers/gpio/gpio-pcie-idio-24.c | 22 +- drivers/gpio/gpiolib.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 - .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 86 ++++++++ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 10 + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 14 + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 5 drivers/gpu/drm/amd/display/include/dal_asic_id.h | 9 + .../drm/amd/display/modules/color/color_gamma.c | 72 ++++--- drivers/gpu/drm/amd/include/atomfirmware.h | 170 ++++++++++++++++- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 52 ++--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 4 drivers/gpu/drm/bridge/Kconfig | 1 drivers/gpu/drm/drm_atomic.c | 8 + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 drivers/gpu/drm/exynos/exynos_mixer.c | 22 ++ drivers/gpu/drm/exynos/regs-mixer.h | 1 drivers/gpu/drm/i915/intel_cdclk.c | 41 ++++ drivers/gpu/drm/i915/intel_display.c | 2 drivers/gpu/drm/i915/intel_dp.c | 20 -- drivers/gpu/drm/i915/intel_lvds.c | 3 drivers/gpu/drm/nouveau/nouveau_bo.c | 1 drivers/gpu/drm/nouveau/nouveau_bo.h | 2 drivers/gpu/drm/nouveau/nouveau_ttm.c | 6 - drivers/gpu/drm/nouveau/nv50_display.c | 7 - drivers/gpu/drm/omapdrm/dss/dispc.c | 20 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 drivers/gpu/drm/omapdrm/omap_connector.c | 10 + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 - drivers/gpu/drm/omapdrm/tcm-sita.c | 2 drivers/gpu/drm/ttm/ttm_page_alloc.c | 11 + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 drivers/gpu/drm/vc4/vc4_dpi.c | 25 ++ drivers/gpu/drm/vc4/vc4_plane.c | 2 drivers/hid/Kconfig | 7 - drivers/hid/hid-ids.h | 9 + drivers/hid/hid-lenovo.c | 36 ++++ drivers/hid/i2c-hid/i2c-hid.c | 2 drivers/hid/intel-ish-hid/ishtp-hid-client.c | 36 ++-- drivers/hid/intel-ish-hid/ishtp/bus.c | 2 drivers/hid/wacom_sys.c | 4 drivers/md/dm-bufio.c | 5 drivers/md/dm-cache-background-tracker.c | 2 drivers/md/dm-integrity.c | 2 drivers/md/dm-raid1.c | 10 + drivers/md/dm.c | 7 - drivers/mtd/nand/onenand/omap2.c | 105 ++++------ drivers/mtd/nand/raw/marvell_nand.c | 12 + drivers/mtd/nand/raw/nand_base.c | 5 drivers/net/bonding/bond_alb.c | 15 + drivers/net/bonding/bond_main.c | 2 drivers/net/can/dev.c | 2 drivers/net/can/flexcan.c | 26 +-- drivers/net/can/spi/hi311x.c | 11 + drivers/net/can/usb/kvaser_usb.c | 2 drivers/net/dsa/mv88e6xxx/chip.c | 26 +++ drivers/net/dsa/mv88e6xxx/chip.h | 1 drivers/net/dsa/mv88e6xxx/global2.c | 2 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 20 +- drivers/net/ethernet/broadcom/tg3.c | 9 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 - drivers/net/ethernet/intel/ice/ice_controlq.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 16 ++ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 - drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 28 +++ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 11 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 drivers/net/ethernet/mellanox/mlxsw/core.c | 4 drivers/net/ethernet/netronome/nfp/flower/main.c | 19 -- drivers/net/ethernet/ni/nixge.c | 10 + drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 - drivers/net/ethernet/qlogic/qed/qed_main.c | 2 drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 drivers/net/ethernet/realtek/r8169.c | 3 drivers/net/ethernet/sun/niu.c | 5 drivers/net/hyperv/netvsc_drv.c | 3 drivers/net/hyperv/rndis_filter.c | 2 drivers/net/ieee802154/atusb.c | 2 drivers/net/ieee802154/mcr20a.c | 15 + drivers/net/phy/broadcom.c | 10 + drivers/net/phy/sfp-bus.c | 2 drivers/net/wireless/mac80211_hwsim.c | 1 drivers/nvme/host/core.c | 8 + drivers/nvme/host/nvme.h | 5 drivers/nvme/host/pci.c | 12 + drivers/of/overlay.c | 30 ++- drivers/pci/pci.c | 37 +++- drivers/pinctrl/intel/pinctrl-cherryview.c | 16 +- drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 45 ++++ drivers/pinctrl/meson/pinctrl-meson-axg.c | 2 drivers/thermal/int340x_thermal/int3403_thermal.c | 3 drivers/thermal/samsung/exynos_tmu.c | 14 + fs/ceph/file.c | 205 ++++++++++++-------- fs/cifs/cifsfs.c | 13 + fs/cifs/connect.c | 8 - fs/cifs/smb2ops.c | 6 + fs/cifs/smb2pdu.c | 73 ++++--- fs/ocfs2/refcounttree.c | 14 + fs/proc/kcore.c | 23 ++ include/linux/brcmphy.h | 1 include/linux/ceph/osd_client.h | 12 + include/linux/kthread.h | 1 include/linux/oom.h | 2 include/linux/rbtree_augmented.h | 1 include/linux/rbtree_latch.h | 1 include/linux/sched.h | 50 ++++- include/linux/sched/signal.h | 2 include/net/bonding.h | 1 include/net/flow_dissector.h | 2 include/net/mac80211.h | 2 include/net/xfrm.h | 1 include/trace/events/rxrpc.h | 85 ++++++++ include/trace/events/sunrpc.h | 16 +- include/uapi/linux/nl80211.h | 2 init/main.c | 9 + kernel/bpf/syscall.c | 19 +- kernel/compat.c | 1 kernel/events/ring_buffer.c | 7 - kernel/kthread.c | 50 ++--- kernel/module.c | 5 kernel/sched/autogroup.c | 7 - kernel/sched/core.c | 56 +++-- kernel/sched/cpufreq_schedutil.c | 16 -- kernel/sched/fair.c | 59 ------ kernel/signal.c | 17 +- kernel/stop_machine.c | 19 +- kernel/trace/trace_events_filter.c | 3 lib/find_bit_benchmark.c | 7 + lib/swiotlb.c | 2 mm/migrate.c | 4 mm/mmap.c | 76 ++++++- mm/oom_kill.c | 81 ++++---- mm/sparse.c | 2 mm/vmstat.c | 6 - mm/z3fold.c | 42 +++- net/9p/trans_common.c | 2 net/9p/trans_fd.c | 4 net/9p/trans_rdma.c | 4 net/9p/trans_virtio.c | 5 net/9p/trans_xen.c | 2 net/atm/lec.c | 9 + net/ceph/osd_client.c | 27 ++- net/ieee802154/6lowpan/6lowpan_i.h | 4 net/ieee802154/6lowpan/reassembly.c | 14 + net/ipv4/ping.c | 7 - net/ipv4/route.c | 1 net/ipv4/udp.c | 11 + net/ipv6/Kconfig | 9 - net/ipv6/ip6_vti.c | 4 net/ipv6/udp.c | 4 net/ipv6/xfrm6_tunnel.c | 3 net/key/af_key.c | 45 +++- net/llc/af_llc.c | 3 net/mac80211/agg-tx.c | 4 net/mac80211/mlme.c | 27 ++- net/mac80211/tx.c | 3 net/netlink/af_netlink.c | 6 - net/nsh/nsh.c | 4 net/openvswitch/flow_netlink.c | 9 - net/rfkill/rfkill-gpio.c | 7 + net/rxrpc/af_rxrpc.c | 2 net/rxrpc/ar-internal.h | 1 net/rxrpc/conn_event.c | 11 + net/rxrpc/input.c | 2 net/rxrpc/local_event.c | 3 net/rxrpc/local_object.c | 57 ++++-- net/rxrpc/output.c | 34 +++ net/rxrpc/peer_event.c | 46 ++-- net/rxrpc/rxkad.c | 6 - net/rxrpc/sendmsg.c | 10 + net/sched/act_skbedit.c | 3 net/sched/act_skbmod.c | 5 net/sched/cls_api.c | 2 net/sctp/associola.c | 30 +++ net/sctp/sm_make_chunk.c | 2 net/sctp/sm_statefuns.c | 86 ++++---- net/sctp/ulpevent.c | 1 net/sunrpc/xprtrdma/fmr_ops.c | 5 net/sunrpc/xprtrdma/frwr_ops.c | 9 - net/sunrpc/xprtrdma/verbs.c | 5 net/sunrpc/xprtrdma/xprt_rdma.h | 2 net/tipc/node.c | 15 + net/tipc/socket.c | 3 net/tls/tls_main.c | 12 - net/wireless/core.c | 3 net/wireless/nl80211.c | 1 net/wireless/reg.c | 1 net/xfrm/xfrm_state.c | 6 + scripts/dtc/checks.c | 5 scripts/faddr2line | 5 tools/arch/arm/include/uapi/asm/kvm.h | 6 + tools/arch/arm64/include/uapi/asm/kvm.h | 6 + tools/arch/x86/include/asm/cpufeatures.h | 1 tools/include/uapi/linux/kvm.h | 7 + tools/perf/bench/numa.c | 2 tools/perf/pmu-events/arch/x86/mapfile.csv | 1 tools/perf/util/parse-events.y | 8 - tools/testing/selftests/net/Makefile | 2 .../selftests/tc-testing/tc-tests/actions/bpf.json | 11 + 263 files changed, 2315 insertions(+), 1162 deletions(-)