]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
remove ptp patch from 3.0 and 3.4 queues as it shouldn't have been there
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2012 18:46:23 +0000 (10:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2012 18:46:23 +0000 (10:46 -0800)
queue-3.0/ptp-update-adjfreq-callback-description.patch [deleted file]
queue-3.0/series
queue-3.4/ptp-update-adjfreq-callback-description.patch [deleted file]
queue-3.4/series

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 (file)
index 7cde829..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 87f4d7c1d36f44b0822053b7e5dedc31fdd0ab99 Mon Sep 17 00:00:00 2001
-From: Jacob Keller <jacob.e.keller@intel.com>
-Date: Thu, 1 Nov 2012 12:30:16 +0000
-Subject: ptp: update adjfreq callback description
-
-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.
index eb122b4bd0eeda060c338ae0ee89f0c6a2c6a978..bea74f53d6067f078dfffc19bf851de94f015f66 100644 (file)
@@ -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 (file)
index 7cde829..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 87f4d7c1d36f44b0822053b7e5dedc31fdd0ab99 Mon Sep 17 00:00:00 2001
-From: Jacob Keller <jacob.e.keller@intel.com>
-Date: Thu, 1 Nov 2012 12:30:16 +0000
-Subject: ptp: update adjfreq callback description
-
-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.
index 77a639d8375e00ba18f6285f2daaf4de8e0ad396..39d5db3592fbbd9e87dfb1563388939e90c0f493 100644 (file)
@@ -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