summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-20 08:28:57 -0500
committerKyle McMartin <kyle@mcmartin.ca>2010-11-20 08:28:57 -0500
commit49d23722dfbdeca9a8cb66ba87104e31bb98e62f (patch)
tree077b797e873ff409c28796e75e1a579fddb54b97 /kernel.spec
parent16ab22b5320d6df5f4eaae3ed419d2f9c713b284 (diff)
fix BUG when using xt_SECMARK
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index d85d3807..3fb5865b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -724,6 +724,8 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch12305: xhci_hcd-suspend-resume.patch
+Patch12306: secmark-do-not-return-early-if-there-was-no-error.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1342,6 +1344,8 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
ApplyPatch xhci_hcd-suspend-resume.patch
+ApplyPatch secmark-do-not-return-early-if-there-was-no-error.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1955,6 +1959,10 @@ fi
# || ||
%changelog
+* Sat Nov 20 2010 Kyle McMartin <kyle@redhat.com>
+- secmark-do-not-return-early-if-there-was-no-error.patch: requested
+ by eparis@. (Fixes a BUG when using secmark.)
+
* Wed Nov 17 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-5
- Disable drm/intel rebase until it can be fixed.