linux-kernel - Re: [PULL] clockevents: fixes for 4.3-rc7

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 30 Oct 2015 10:43:11 +0100 (CET)
From:	Thomas Gleixner <tglx@...utronix.de>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>
cc:	Magnus Damm <damm+renesas@...nsource.se>,
	Jisheng Zhang <jszhang@...vell.com>,
	Matthias Brugger <matthias.bgg@...il.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PULL] clockevents: fixes for 4.3-rc7

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/