From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752248AbbCYJJf (ORCPT <rfc822;w@1wt.eu>);
	Wed, 25 Mar 2015 05:09:35 -0400
Received: from mail-wi0-f177.google.com ([209.85.212.177]:35525 "EHLO
	mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751084AbbCYJJc (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 25 Mar 2015 05:09:32 -0400
Date: Wed, 25 Mar 2015 10:09:26 +0100
From: Ingo Molnar <mingo@kernel.org>
To: John Stultz <john.stultz@linaro.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
        Daniel Thompson <daniel.thompson@linaro.org>,
        Russell King <linux@arm.linux.org.uk>,
        Will Deacon <will.deacon@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Stephen Boyd <sboyd@codeaurora.org>,
        Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH 0/5] Arch-generic sched_clock NMI safety and
 optimizations for -tip
Message-ID: <20150325090926.GA696@gmail.com>
References: <1426613906-19718-1-git-send-email-john.stultz@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1426613906-19718-1-git-send-email-john.stultz@linaro.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* John Stultz <john.stultz@linaro.org> wrote:

> Ingo, Peter, Thomas,
> 
>   The following patches from Daniel extend the arch-generic sched_clock
> implementation so that it can be safely called from NMI (or FIQ on ARM)
> context. They also optimize the sched_clock logic to improve cache
> performance. I wanted to send them along so they could be queued in
> -tip for 4.1.

Hm, the first patch does not apply to tip:timers/core, as it conflicts 
with:

  fb82fe2fe858 clocksource: Add 'max_cycles' to 'struct clocksource'
  362fde041037 clocksource: Simplify the logic around clocksource wrapping safety margins

Mind resending your latest queue as patches, on top of tip:timers/core 
or tip:master?

Thanks,

	Ingo