From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbbEHBYl (ORCPT ); Thu, 7 May 2015 21:24:41 -0400 Received: from mail-vn0-f45.google.com ([209.85.216.45]:33820 "EHLO mail-vn0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752076AbbEHBYi (ORCPT ); Thu, 7 May 2015 21:24:38 -0400 MIME-Version: 1.0 In-Reply-To: <20150507115644.1ef29d2e@bbrezillon> References: <20150502190119.666291882@linuxfoundation.org> <20150505221038.GB22408@kroah.com> <20150507085553.GA2195@ares.olymp> <20150507115644.1ef29d2e@bbrezillon> Date: Thu, 7 May 2015 18:24:37 -0700 Message-ID: Subject: Re: [PATCH 3.19 000/177] 3.19.7-stable review From: Tyler Baker To: Boris Brezillon Cc: Luis Henriques , Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" , torvalds@linux-foundation.org, Andrew Morton , Guenter Roeck , shuah.kh@samsung.com, stable@vger.kernel.org, Mike Turquette Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7 May 2015 at 02:56, Boris Brezillon wrote: > Luis, Tyler, > > On Thu, 7 May 2015 09:55:53 +0100 > Luis Henriques wrote: > >> On Wed, May 06, 2015 at 10:25:17PM -0700, Tyler Baker wrote: >> > >> > Locally I've reverted c67881fc890916206e723329e774391c6ed354ce on top >> > of v3.19.7 and confirmed that my at91-sama5d3_xplained boots that >> > kernel successfully[4]. >> > >> >> And that makes sense as commit 1c8e600440c7 ("clk: Add rate >> constraints to clocks") isn't in 3.19. This commit changes the >> signature of .determine_rate to include the 2 extra args present in >> at91sam9x5_clk_usb_determine_rate() after commit >> c67881fc890916206e723329e774391c6ed354ce. > > Oops, indeed. I shouldn't have tagged this commit for stable. > Below is a patch fixing this problem. > Sorry for the inconvenience. Tested this patch, and confirmed it resolves the boot issues. Thanks for a speedy response. > > Best Regards, > > Boris > > -- >8 -- > From 73a2cf633be185570c7df689afedaebed86d8451 Mon Sep 17 00:00:00 2001 > Subject: [PATCH] clk: at91: usb: fix determine_rate prototype > > Commit c67881fc890916206e723329e774391c6ed354ce is a backport of > 0b67c43ce36a9964f1d5e3f973ee19eefd3f9f8f upstream commit, fixing a > bug on clk rate change propagation. > But in 4.0 ->determine_rate() prototype has changed, thus introducing > a prototype mismatch when applying it on 3.19. > > Signed-off-by: Boris Brezillon > --- > drivers/clk/at91/clk-usb.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c > index 0b7c3e8..0283a57 100644 > --- a/drivers/clk/at91/clk-usb.c > +++ b/drivers/clk/at91/clk-usb.c > @@ -58,8 +58,6 @@ static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw, > > static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, > unsigned long rate, > - unsigned long min_rate, > - unsigned long max_rate, > unsigned long *best_parent_rate, > struct clk_hw **best_parent_hw) > { > -- > 1.9.1 > Cheers, Tyler