Merge tag 'v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994802AbdGCBIxPrdd0/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jul 3 02:28:58 2017 +0200 Commit: 074e922532cced3caf357e8ec7f54360a6acd619 Gitweb: https://git.linux-mips.org/g/ralf/linux/074e922532cc Branch: master --- .../devicetree/bindings/clock/sunxi-ccu.txt | 7 + .../devicetree/bindings/gpio/gpio-mvebu.txt | 6 + .../devicetree/bindings/mfd/stm32-timers.txt | 2 Documentation/devicetree/bindings/net/dsa/b53.txt | 2 Documentation/devicetree/bindings/net/smsc911x.txt | 1 Makefile | 4 - arch/arm64/kernel/vdso.c | 5 + arch/arm64/kernel/vdso/gettimeofday.S | 1 arch/mips/kvm/tlb.c | 6 + arch/powerpc/include/asm/kprobes.h | 1 arch/powerpc/kernel/exceptions-64s.S | 11 +- arch/powerpc/kernel/kprobes.c | 17 ++++ arch/powerpc/kernel/setup_64.c | 31 ++++++- arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 59 ++++++++++--- arch/powerpc/kvm/book3s_hv.c | 51 +++++++++++ arch/powerpc/kvm/book3s_hv_interrupts.S | 12 ++- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 75 ++++++++++++---- arch/powerpc/perf/perf_regs.c | 3 - arch/powerpc/platforms/powernv/npu-dma.c | 94 ++++++++++++++------ arch/s390/kvm/gaccess.c | 15 +-- arch/x86/events/intel/core.c | 4 - arch/x86/include/asm/kvm_emulate.h | 1 arch/x86/include/asm/mshyperv.h | 3 - arch/x86/kvm/emulate.c | 1 arch/x86/kvm/x86.c | 62 +++++++------ block/blk-mq-sched.c | 58 ++++++++++-- block/blk-mq-sched.h | 9 -- block/blk-mq.c | 16 +++ drivers/acpi/scan.c | 67 ++++++++------ drivers/block/xen-blkback/blkback.c | 26 +++--- drivers/block/xen-blkback/common.h | 26 +----- drivers/block/xen-blkback/xenbus.c | 15 ++- drivers/char/random.c | 12 +-- drivers/clk/meson/Kconfig | 1 drivers/clk/sunxi-ng/Kconfig | 1 drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 4 + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 4 + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 drivers/clocksource/arm_arch_timer.c | 4 - drivers/clocksource/cadence_ttc_timer.c | 1 drivers/clocksource/timer-sun5i.c | 1 drivers/gpio/gpio-mvebu.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 4 - drivers/gpu/drm/drm_connector.c | 38 ++++---- drivers/gpu/drm/i915/i915_gem.c | 63 +++++++++---- drivers/gpu/drm/i915/i915_gem_request.c | 2 drivers/gpu/drm/i915/i915_guc_submission.c | 4 - drivers/gpu/drm/i915/intel_display.c | 30 ++++-- drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 2 drivers/gpu/drm/i915/intel_lrc.c | 6 - drivers/gpu/drm/i915/intel_ringbuffer.c | 41 ++++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 19 ++++ drivers/gpu/drm/radeon/radeon_combios.c | 7 + drivers/gpu/drm/radeon/radeon_device.c | 4 + drivers/hid/hid-ids.h | 3 + drivers/hid/hid-magicmouse.c | 15 +-- drivers/hid/usbhid/hid-quirks.c | 1 drivers/i2c/busses/i2c-imx.c | 8 +- drivers/input/misc/soc_button_array.c | 20 +++- drivers/input/rmi4/rmi_f54.c | 17 +--- drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/irqchip/irq-mips-gic.c | 6 + drivers/md/dm-integrity.c | 12 ++- drivers/md/dm-io.c | 4 - drivers/md/dm-raid1.c | 21 ++++ drivers/mfd/arizona-core.c | 3 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 drivers/net/ethernet/freescale/fman/mac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 16 +++ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 - drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 77 +++++++++------- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +++ drivers/net/ethernet/sfc/ef10_sriov.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++- .../broadcom/brcm80211/brcmfmac/firmware.c | 35 ++++--- .../broadcom/brcm80211/brcmfmac/firmware.h | 4 - .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 17 +++- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 18 +++- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 9 +- drivers/ntb/hw/intel/ntb_hw_intel.c | 2 drivers/ntb/ntb_transport.c | 58 ++---------- drivers/ntb/test/ntb_perf.c | 4 - drivers/pinctrl/pinctrl-amd.c | 91 +++++++++---------- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 drivers/scsi/qedi/qedi_fw.c | 1 drivers/scsi/qedi/qedi_main.c | 4 - drivers/target/iscsi/iscsi_target.c | 22 ++++- drivers/target/target_core_internal.h | 2 drivers/target/target_core_tmr.c | 16 ++- drivers/target/target_core_transport.c | 9 +- fs/autofs4/dev-ioctl.c | 2 fs/cifs/file.c | 2 fs/cifs/misc.c | 2 fs/cifs/smb1ops.c | 9 +- fs/cifs/smb2ops.c | 8 +- fs/cifs/xattr.c | 2 fs/dax.c | 1 fs/exec.c | 28 +++++- fs/ocfs2/dlmglue.c | 4 + fs/ocfs2/xattr.c | 23 +++-- fs/ufs/balloc.c | 22 +---- fs/ufs/inode.c | 27 ++---- fs/ufs/super.c | 9 ++ fs/ufs/ufs_fs.h | 2 fs/xfs/xfs_aops.c | 7 + include/acpi/acpi_bus.h | 3 - include/dt-bindings/clock/sun50i-a64-ccu.h | 2 include/dt-bindings/clock/sun8i-h3-ccu.h | 2 include/linux/blkdev.h | 2 include/linux/slub_def.h | 1 include/linux/timekeeper_internal.h | 5 - include/net/wext.h | 4 - kernel/events/ring_buffer.c | 2 kernel/livepatch/patch.c | 8 +- kernel/livepatch/transition.c | 36 +++++++- kernel/signal.c | 20 +++- kernel/time/timekeeping.c | 71 ++++++++++----- lib/cmdline.c | 6 + mm/khugepaged.c | 1 mm/mmap.c | 19 +++- mm/slub.c | 40 ++++++--- mm/vmalloc.c | 15 +++ net/8021q/vlan.c | 3 - net/core/dev.c | 2 net/core/dev_ioctl.c | 19 +++- net/core/fib_rules.c | 21 +++- net/core/rtnetlink.c | 2 net/decnet/dn_route.c | 14 +-- net/ipv4/igmp.c | 1 net/ipv4/ip_tunnel.c | 2 net/ipv6/addrconf.c | 6 + net/ipv6/fib6_rules.c | 22 +---- net/ipv6/ip6_fib.c | 3 - net/ipv6/ip6_tunnel.c | 6 + net/rxrpc/key.c | 64 +++++++------- net/sctp/endpointola.c | 1 net/sctp/sctp_diag.c | 5 + net/sctp/socket.c | 5 - net/wireless/wext-core.c | 22 ++--- scripts/Makefile.headersinst | 10 ++ scripts/genksyms/genksyms.h | 2 scripts/kconfig/Makefile | 2 scripts/kconfig/nconf.c | 12 +-- scripts/kconfig/nconf.gui.c | 4 - scripts/tags.sh | 1 sound/core/pcm_lib.c | 4 - sound/firewire/amdtp-stream.c | 8 +- sound/firewire/amdtp-stream.h | 2 sound/pci/hda/hda_intel.c | 11 ++ tools/perf/util/probe-event.c | 2 tools/testing/selftests/ntb/ntb_test.sh | 2 160 files changed, 1354 insertions(+), 815 deletions(-)