From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030616AbbJ3Jny (ORCPT ); Fri, 30 Oct 2015 05:43:54 -0400 Received: from www.linutronix.de ([62.245.132.108]:59780 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965478AbbJ3Jnx (ORCPT ); Fri, 30 Oct 2015 05:43:53 -0400 Date: Fri, 30 Oct 2015 10:43:11 +0100 (CET) From: Thomas Gleixner To: Daniel Lezcano cc: Magnus Damm , Jisheng Zhang , Matthias Brugger , Linux Kernel Mailing List Subject: Re: [PULL] clockevents: fixes for 4.3-rc7 In-Reply-To: <5630C947.4020706@linaro.org> Message-ID: References: <5630C947.4020706@linaro.org> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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