Messages in this thread | | | From | "Keller, Jacob E" <> | Subject | RE: [ 05/38] ptp: update adjfreq callback description | Date | Mon, 26 Nov 2012 21:19:07 +0000 |
| |
> -----Original Message----- > From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org] > Sent: Monday, November 26, 2012 10:46 AM > To: Herton Ronaldo Krzesinski > Cc: linux-kernel@vger.kernel.org; stable@vger.kernel.org; > alan@lxorguk.ukuu.org.uk; Keller, Jacob E; Richard Cochran; John Stultz; > Kirsher, Jeffrey T; David S. Miller > Subject: Re: [ 05/38] ptp: update adjfreq callback description > > 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 <jacob.e.keller@intel.com> > > > > > > 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 <jacob.e.keller@intel.com> > > > CC: Richard Cochran <richard.cochran@gmail.com> > > > CC: John Stultz <john.stultz@linaro.org> > > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > > > Signed-off-by: David S. Miller <davem@davemloft.net> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > > --- > > > 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
It seems to me that it should be applied back to 3.0 if PTP is there..
- Jake
| |