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 S966185AbbJ3JxQ (ORCPT <rfc822;w@1wt.eu>);
	Fri, 30 Oct 2015 05:53:16 -0400
Received: from mail-wm0-f48.google.com ([74.125.82.48]:33934 "EHLO
	mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S965545AbbJ3JxP (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 30 Oct 2015 05:53:15 -0400
Subject: Re: [PULL] clockevents: fixes for 4.3-rc7
To: Thomas Gleixner <tglx@linutronix.de>
References: <5630C947.4020706@linaro.org>
 <alpine.DEB.2.11.1510301041570.4032@nanos>
Cc: Magnus Damm <damm+renesas@opensource.se>,
        Jisheng Zhang <jszhang@marvell.com>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Message-ID: <56333E05.2090408@linaro.org>
Date: Fri, 30 Oct 2015 10:53:09 +0100
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.11.1510301041570.4032@nanos>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 10/30/2015 10:43 AM, Thomas Gleixner wrote:
> On Wed, 28 Oct 2015, Daniel Lezcano wrote:
>> this pull request contains a set of fixes for tip/timers/urgent:
>>
>>   - Prevent ftrace recursion by adding the 'notrace' attribute to the
>> sched_clock read callback (Jisheng Zhang).
>>
>>   - Fix multiple shutdown call issue (Magnus Damm).
>>
>> Beside that, the commit fc686d0037d782c994e338ecb01bfef8bbafff9f:
>>
>> "clockevents/drivers/mtk: Fix spurious interrupt leading to crash"
>>
>> is merged in tip/timers/core but it is needed also as a fix for 4.3. This pull
>> request does not contain this fix in order to prevent a conflict when merging
>> tip/timers/urgent into tip/timers/core.
>>
>> How shall I backport this fix from 'core' to 'urgent' without bringing a
>> conflict when you will merge both branches ?
>
> The simplest way is to just do nothing and when that commit hits linus
> tree during the merge window, ask the stable folks to pick it up.

Ok, makes sense.

Thanks !

   -- Daniel


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog