Am Mittwoch, 20. August 2014, 21:15:10 schrieb Doug Anderson: > Guenter / Heiko, > > On Tue, Aug 19, 2014 at 5:45 PM, Guenter Roeck <linux@xxxxxxxxxxxx> wrote: > > From: Heiko Stübner <heiko@xxxxxxxxx> > > > > Add infrastructure to write the correct value to the restart register and > > register the restart notifier for both rk3188 (including rk3066) and > > rk3288. > > > > Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx> > > Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> > > --- > > v7: Added patch to series. > > > > 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(+) > > 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, while this series will most likely go through somewhere else (Linus' tree directly or something), so I guess the merge conflic will be resolved by Linus 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 other. Heiko -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |