From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from gloria.sntech.de ([95.129.55.99]:53973 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753634AbaHUISu convert rfc822-to-8bit (ORCPT ); Thu, 21 Aug 2014 04:18:50 -0400 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Doug Anderson Cc: Guenter Roeck , Russell King , Wim Van Sebroeck , Catalin Marinas , Maxime Ripard , Andrew Morton , "linux-watchdog@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-pm@vger.kernel.org" , linux-samsung-soc , Will Deacon , Arnd Bergmann , Jonas Jensen , Randy Dunlap , Steven Rostedt , Ingo Molnar , Dmitry Eremin-Solenikov , David Woodhouse , Tomasz Figa , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v7 11/11] clk: rockchip: add restart handler Date: Thu, 21 Aug 2014 10:18:08 +0200 Message-ID: <18796253.Gqruund2RM@phil> In-Reply-To: References: <1408495538-27480-1-git-send-email-linux@roeck-us.net> <1408495538-27480-12-git-send-email-linux@roeck-us.net> MIME-Version: 1.0 Content-Transfer-Encoding: QUOTED-PRINTABLE Content-Type: text/plain; charset=iso-8859-1 Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org Am Mittwoch, 20. August 2014, 21:15:10 schrieb Doug Anderson: > Guenter / Heiko, >=20 > On Tue, Aug 19, 2014 at 5:45 PM, Guenter Roeck w= rote: > > From: Heiko St=FCbner > >=20 > > Add infrastructure to write the correct value to the restart regist= er and > > register the restart notifier for both rk3188 (including rk3066) an= d > > rk3288. > >=20 > > Signed-off-by: Heiko Stuebner > > Signed-off-by: Guenter Roeck > > --- > > v7: Added patch to series. > >=20 > > drivers/clk/rockchip/clk-rk3188.c | 2 ++ > > drivers/clk/rockchip/clk-rk3288.c | 2 ++ > > drivers/clk/rockchip/clk.c | 25 +++++++++++++++++++++++++ > > drivers/clk/rockchip/clk.h | 1 + > > 4 files changed, 30 insertions(+) >=20 > This patch doesn't apply cleanly with the in-flight (clk: rockchip: > protect critical clocks from getting disabled) patch from Heiko. It'= s > trivial to resolve and unclear which will land first, so I think it's > fine... This should be expected :-) . The patch about critical clocks will (hopefully soon) go through Mike's= tree,=20 while this series will most likely go through somewhere else (Linus' tr= ee=20 directly or something), so I guess the merge conflic will be resolved b= y Linus=20 when both trees meet each other during the merge window. So both this patch as well as the other one should stay independent of = each=20 other. Heiko -- To unsubscribe from this list: send the line "unsubscribe linux-watchdo= g" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html