From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Thomas Gleixner <tglx@linutronix.de>
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>
Subject: Re: [PULL] clockevents: fixes for 4.3-rc7
Date: Fri, 30 Oct 2015 10:53:09 +0100 [thread overview]
Message-ID: <56333E05.2090408@linaro.org> (raw)
In-Reply-To: <alpine.DEB.2.11.1510301041570.4032@nanos>
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
prev parent reply other threads:[~2015-10-30 9:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 13:10 [PULL] clockevents: fixes for 4.3-rc7 Daniel Lezcano
2015-10-28 13:11 ` [PATCH 1/8] clocksource/drivers/arm_global_timer: Prevent ftrace recursion Daniel Lezcano
2015-10-28 13:11 ` Daniel Lezcano
2015-10-28 13:11 ` [PATCH 2/8] clocksource/drivers/pistachio: " Daniel Lezcano
2015-10-28 13:11 ` [PATCH 3/8] clocksource/drivers/samsung_pwm_timer: " Daniel Lezcano
2015-10-28 13:11 ` [PATCH 4/8] clocksource/drivers/prima2: " Daniel Lezcano
2015-10-28 13:11 ` Daniel Lezcano
2015-10-28 13:11 ` [PATCH 5/8] clocksource/drivers/vf_pit_timer: " Daniel Lezcano
2015-10-28 13:11 ` [PATCH 6/8] clocksource/drivers/fsl_ftm_timer: " Daniel Lezcano
2015-10-28 13:11 ` [PATCH 7/8] clocksource/drivers/digicolor: " Daniel Lezcano
2015-10-28 13:11 ` Daniel Lezcano
2015-10-28 13:11 ` [PATCH 8/8] clocksource/drivers/sh_mtu2: Fix multiple shutdown call issue Daniel Lezcano
2015-10-30 9:43 ` [PULL] clockevents: fixes for 4.3-rc7 Thomas Gleixner
2015-10-30 9:53 ` Daniel Lezcano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56333E05.2090408@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=damm+renesas@opensource.se \
--cc=jszhang@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.