Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065Ab2KZSqP (ORCPT ); Mon, 26 Nov 2012 13:46:15 -0500 Received: from mail.kernel.org ([198.145.19.201]:56611 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753315Ab2KZSqM (ORCPT ); Mon, 26 Nov 2012 13:46:12 -0500 Date: Mon, 26 Nov 2012 10:46:10 -0800 From: Greg Kroah-Hartman To: Herton Ronaldo Krzesinski Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, alan@lxorguk.ukuu.org.uk, Jacob Keller , Richard Cochran , John Stultz , Jeff Kirsher , "David S. Miller" Subject: Re: [ 05/38] ptp: update adjfreq callback description Message-ID: <20121126184610.GC21012@kroah.com> References: <20121122003904.262382971@linuxfoundation.org> <20121122003904.841717525@linuxfoundation.org> <20121124002600.GA12014@herton-Z68MA-D2H-B3> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121124002600.GA12014@herton-Z68MA-D2H-B3> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2082 Lines: 52 On Fri, Nov 23, 2012 at 10:26:01PM -0200, Herton Ronaldo Krzesinski wrote: > On Wed, Nov 21, 2012 at 04:39:48PM -0800, Greg Kroah-Hartman wrote: > > 3.0-stable review patch. If anyone has any objections, please let me know. > > > > ------------------ > > > > From: Jacob Keller > > > > commit 87f4d7c1d36f44b0822053b7e5dedc31fdd0ab99 upstream. > > > > This patch updates the adjfreq callback description to include a note that the > > delta in ppb is always relative to the base frequency, and not to the current > > frequency of the hardware clock. > > > > Signed-off-by: Jacob Keller > > CC: Richard Cochran > > CC: John Stultz > > Signed-off-by: Jeff Kirsher > > Signed-off-by: David S. Miller > > Signed-off-by: Greg Kroah-Hartman > > > > --- > > include/linux/ptp_clock_kernel.h | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > --- a/include/linux/ptp_clock_kernel.h > > +++ b/include/linux/ptp_clock_kernel.h > > @@ -50,7 +50,8 @@ struct ptp_clock_request { > > * clock operations > > * > > * @adjfreq: Adjusts the frequency of the hardware clock. > > - * parameter delta: Desired period change in parts per billion. > > + * parameter delta: Desired frequency offset from nominal frequency > > + * in parts per billion > > * > > * @adjtime: Shifts the time of the hardware clock. > > * parameter delta: Desired change in nanoseconds. > > This was marked for only 3.5 or later on the original changelog: > "CC: stable@vger.kernel.org [v3.5+]" Ugh, my fault, now dropped from the 3.0 and 3.4-stable trees, thanks for finding my error. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/