From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752270AbcBOQIL (ORCPT ); Mon, 15 Feb 2016 11:08:11 -0500 Received: from mga04.intel.com ([192.55.52.120]:39126 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbcBOQIK (ORCPT ); Mon, 15 Feb 2016 11:08:10 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,451,1449561600"; d="scan'208";a="746748512" From: Alexander Shishkin To: Greg KH Cc: linux-kernel@vger.kernel.org, laurent.fert@intel.com, yann.fouassier@intel.com, Mathieu Poirier , Chunyan Zhang Subject: [git pull] stm class/intel_th: Updates for char-misc-next User-Agent: Notmuch/0.21 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Mon, 15 Feb 2016 18:08:07 +0200 Message-ID: <871t8ec5y0.fsf@ashishki-desk.ger.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, These are patches I have queued for the next merge window. Please consider pulling. The following changes since commit 1b79dff672ca09a5461cc1d46ad81c62137841c5: Merge 4.5-rc4 into char-misc-next (2016-02-14 14:25:59 -0800) are available in the git repository at: https://github.com/virtuoso/linux-perf.git stm-for-greg for you to fetch changes up to fb756bc533ca533c2f415b74589b7172c3456b7c: stm class: dummy_stm: Add link callback for fault injection (2016-02-15 15:54:37 +0200) ---------------------------------------------------------------- Alexander Shishkin (16): intel_th: Depend on HAS_IOMEM intel_th: gth: Remove commented-out code intel_th: Update scratchpad bits according to enabled output activity intel_th: sth: Sanitize packet callback's return values intel_th: Set root device's drvdata early intel_th: Use real device index in the node names stm class: Use driver's packet callback return value stm class: Support devices with multiple instances stm class: dummy_stm: Create multiple devices stm class: Add heartbeat stm source device stm class: Fix unlocking braino in the error path stm class: Guard output assignment against concurrency stm class: Fix unbalanced module/device refcounting stm class: Fix a race in unlinking stm class: Plug stm device's unlink callback stm class: dummy_stm: Add link callback for fault injection Chunyan Zhang (1): stm class: Fix master deallocation in device unregistering Laurent FERT (2): intel_th: msu: Fix offset for wrapped block intel_th: msu: Release resources on read error Lucas Tanure (1): stm class: Use a signed return type for stm_find_master_chan drivers/hwtracing/intel_th/Kconfig | 2 +- drivers/hwtracing/intel_th/core.c | 30 +++++++- drivers/hwtracing/intel_th/gth.c | 32 ++++---- drivers/hwtracing/intel_th/gth.h | 3 - drivers/hwtracing/intel_th/intel_th.h | 41 ++++++++++ drivers/hwtracing/intel_th/msu.c | 9 +-- drivers/hwtracing/intel_th/pci.c | 2 - drivers/hwtracing/intel_th/sth.c | 11 ++- drivers/hwtracing/stm/Kconfig | 11 +++ drivers/hwtracing/stm/Makefile | 2 + drivers/hwtracing/stm/core.c | 138 ++++++++++++++++++++++++++-------- drivers/hwtracing/stm/dummy_stm.c | 71 ++++++++++++++--- drivers/hwtracing/stm/heartbeat.c | 130 ++++++++++++++++++++++++++++++++ drivers/hwtracing/stm/policy.c | 7 +- drivers/hwtracing/stm/stm.h | 1 + include/linux/stm.h | 10 +++ 16 files changed, 420 insertions(+), 80 deletions(-) create mode 100644 drivers/hwtracing/stm/heartbeat.c