From b0f4f1522f27252080fa341e2fd71a0b20c20477 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 26 Nov 2012 10:46:23 -0800 Subject: [PATCH] remove ptp patch from 3.0 and 3.4 queues as it shouldn't have been there --- ...-update-adjfreq-callback-description.patch | 36 ------------------- queue-3.0/series | 1 - ...-update-adjfreq-callback-description.patch | 36 ------------------- queue-3.4/series | 1 - 4 files changed, 74 deletions(-) delete mode 100644 queue-3.0/ptp-update-adjfreq-callback-description.patch delete mode 100644 queue-3.4/ptp-update-adjfreq-callback-description.patch diff --git a/queue-3.0/ptp-update-adjfreq-callback-description.patch b/queue-3.0/ptp-update-adjfreq-callback-description.patch deleted file mode 100644 index 7cde829628c..00000000000 --- a/queue-3.0/ptp-update-adjfreq-callback-description.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 87f4d7c1d36f44b0822053b7e5dedc31fdd0ab99 Mon Sep 17 00:00:00 2001 -From: Jacob Keller -Date: Thu, 1 Nov 2012 12:30:16 +0000 -Subject: ptp: update adjfreq callback description - -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. diff --git a/queue-3.0/series b/queue-3.0/series index eb122b4bd0e..bea74f53d60 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -2,7 +2,6 @@ mm-bugfix-set-current-reclaim_state-to-null-while-returning-from-kswapd.patch pci-pm-fix-deadlock-when-unbinding-device-if-parent-in-d3cold.patch fanotify-fix-missing-break.patch crypto-cryptd-disable-softirqs-in-cryptd_queue_worker-to-prevent-data-corruption.patch -ptp-update-adjfreq-callback-description.patch alsa-hda-cirrus-fix-coefficient-index-for-beep-configuration.patch alsa-hda-force-to-reset-iec958-status-bits-for-ad-codecs.patch asoc-wm8978-pll-incorrectly-configured-when-codec-is-master.patch diff --git a/queue-3.4/ptp-update-adjfreq-callback-description.patch b/queue-3.4/ptp-update-adjfreq-callback-description.patch deleted file mode 100644 index 7cde829628c..00000000000 --- a/queue-3.4/ptp-update-adjfreq-callback-description.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 87f4d7c1d36f44b0822053b7e5dedc31fdd0ab99 Mon Sep 17 00:00:00 2001 -From: Jacob Keller -Date: Thu, 1 Nov 2012 12:30:16 +0000 -Subject: ptp: update adjfreq callback description - -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. diff --git a/queue-3.4/series b/queue-3.4/series index 77a639d8375..39d5db3592f 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -8,7 +8,6 @@ fanotify-fix-missing-break.patch module-fix-out-by-one-error-in-kallsyms.patch cifs-fix-potential-buffer-overrun-in-cifs.idmap-handling-code.patch crypto-cryptd-disable-softirqs-in-cryptd_queue_worker-to-prevent-data-corruption.patch -ptp-update-adjfreq-callback-description.patch alsa-hda-cirrus-fix-coefficient-index-for-beep-configuration.patch alsa-hda-fix-digital-microphone-on-cs420x.patch alsa-hda-force-to-reset-iec958-status-bits-for-ad-codecs.patch -- 2.47.3