Re: [PULL] clockevents: fixes for 4.3-rc7
From: Thomas Gleixner
Date: Fri Oct 30 2015 - 05:43:57 EST
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.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/