Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1258014 > unrolled thread

[PULL] clockevents: fixes for 4.3-rc7

Back to article view | Back to linux.kernel

Contents

  [PULL] clockevents: fixes for 4.3-rc7 Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-28 14:20 +0100
    Re: [PULL] clockevents: fixes for 4.3-rc7 Thomas Gleixner <tglx@linutronix.de> - 2015-10-30 10:50 +0100
      Re: [PULL] clockevents: fixes for 4.3-rc7 Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-30 11:00 +0100

#1258014 — [PULL] clockevents: fixes for 4.3-rc7

Hi Thomas,

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 ?

Thanks !

   -- Daniel

The following changes since commit 56fd16cabac9cd8f15e2902898a9d0cc96e2fa70:

   timekeeping: Increment clock_was_set_seq in timekeeping_init() 
(2015-10-16 15:50:22 +0200)

are available in the git repository at:

   http://git.linaro.org/people/daniel.lezcano/linux.git 
clockevents/4.3-fixes

for you to fetch changes up to b52e0b08c33a1c58830e3a2350b632dbf8fc1688:

   clocksource/drivers/sh_mtu2: Fix multiple shutdown call issue 
(2015-10-28 10:19:32 +0100)

----------------------------------------------------------------
Jisheng Zhang (7):
       clocksource/drivers/arm_global_timer: Prevent ftrace recursion
       clocksource/drivers/pistachio: Prevent ftrace recursion
       clocksource/drivers/samsung_pwm_timer: Prevent ftrace recursion
       clocksource/drivers/prima2: Prevent ftrace recursion
       clocksource/drivers/vf_pit_timer: Prevent ftrace recursion
       clocksource/drivers/fsl_ftm_timer: Prevent ftrace recursion
       clocksource/drivers/digicolor: Prevent ftrace recursion

Magnus Damm (1):
       clocksource/drivers/sh_mtu2: Fix multiple shutdown call issue

  drivers/clocksource/arm_global_timer.c  | 9 +++++++--
  drivers/clocksource/fsl_ftm_timer.c     | 2 +-
  drivers/clocksource/samsung_pwm_timer.c | 2 +-
  drivers/clocksource/sh_mtu2.c           | 4 +++-
  drivers/clocksource/time-pistachio.c    | 3 ++-
  drivers/clocksource/timer-digicolor.c   | 2 +-
  drivers/clocksource/timer-prima2.c      | 2 +-
  drivers/clocksource/vf_pit_timer.c      | 2 +-
  8 files changed, 17 insertions(+), 9 deletions(-)

-- 
  <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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1259363

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.

Thanks,

	tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1259367

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web