[kernel] drop upstream arm-export-read_current_timer.patch

Kyle McMartin kyle at fedoraproject.org
Thu Jun 13 18:20:47 UTC 2013


commit 2afa3c795210e222094c47d5c3a4ff06d00f78da
Author: Kyle McMartin <kyle at redhat.com>
Date:   Thu Jun 13 14:20:28 2013 -0400

    drop upstream arm-export-read_current_timer.patch

 arm-export-read_current_timer.patch |   10 ----------
 kernel.spec                         |    6 ++++--
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 09b5472..f057245 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -695,7 +695,6 @@ Patch15000: nowatchdog-on-virt.patch
 
 
 # ARM
-Patch21000: arm-export-read_current_timer.patch
 
 # lpae
 Patch21001: arm-lpae-ax88796.patch
@@ -1319,7 +1318,6 @@ ApplyPatch debug-bad-pte-modules.patch
 #
 # ARM
 #
-ApplyPatch arm-export-read_current_timer.patch
 ApplyPatch arm-lpae-ax88796.patch
 ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
 ApplyPatch arm-omap-load-tfp410.patch
@@ -2283,6 +2281,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Jun 13 2013 Kyle McMartin <kyle at redhat.com>
+- arm-export-read_current_timer.patch: drop upstream patch
+  (results in duplicate exports)
+
 * Wed Jun 12 2013 Peter Robinson <pbrobinson at fedoraproject.org>
 - Minor ARM config updates
 


More information about the scm-commits mailing list