[PATCH] Drop compile-fixes and upstream-reverts patches

Josh Boyer jwboyer at fedoraproject.org
Tue May 26 23:12:46 UTC 2015


We very very rarely use these.  The last time compile-fixes.patch was
used was over 3 years ago.  The upstream-reverts.patch has literally
never been used since Fedora switched to git.  We tend to apply the
reverts as stand-alone patches anyway, and compile fixes are generally
better as stand-alone patches that get sent upstream ASAP.
---
 compile-fixes.patch    |  6 ------
 kernel.spec            | 12 ------------
 upstream-reverts.patch |  1 -
 3 files changed, 19 deletions(-)
 delete mode 100644 compile-fixes.patch
 delete mode 100644 upstream-reverts.patch

diff --git a/compile-fixes.patch b/compile-fixes.patch
deleted file mode 100644
index 34c08ce..0000000
--- a/compile-fixes.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Small compile fixes (For more involved fixes, please use a separate patch).
-#
-# Please add the errors from gcc before the diffs to save others having
-# to do a compile to figure out what your diff is fixing. Thanks.
-#
diff --git a/kernel.spec b/kernel.spec
index bd1a394..38a6eae 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -481,17 +481,12 @@ Patch00: patch-4.%{base_sublevel}-git%{gitrev}.xz
 %endif
 %endif
 
-# we also need compile fixes for -vanilla
-Patch04: compile-fixes.patch
-
 # build tweak for build ID magic, even for -vanilla
 Patch05: kbuild-AFTER_LINK.patch
 
 %if !%{nopatches}
 
 
-# revert upstream patches we get via other methods
-Patch09: upstream-reverts.patch
 # Git trees.
 
 # Standalone patches
@@ -1175,16 +1170,9 @@ done
 
 ApplyPatch kbuild-AFTER_LINK.patch
 
-#
-# misc small stuff to make things compile
-#
-ApplyOptionalPatch compile-fixes.patch
 
 %if !%{nopatches}
 
-# revert patches from upstream that conflict or that we get via other means
-ApplyOptionalPatch upstream-reverts.patch -R
-
 # Architecture patches
 # x86(-64)
 ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
diff --git a/upstream-reverts.patch b/upstream-reverts.patch
deleted file mode 100644
index 607602c..0000000
--- a/upstream-reverts.patch
+++ /dev/null
@@ -1 +0,0 @@
-nil
-- 
2.4.0



More information about the kernel mailing list