diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-11-20 09:48:42 -0500 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-11-20 09:48:42 -0500 |
| commit | eaa431c101ff69612a09f7f6ffaf41d102a2195d (patch) | |
| tree | 7f98a5de8abe71782600c6c2868fc1b8b2415783 /kernel.spec | |
| parent | 1ef87abd797fabe88b6e403388d4541779862f07 (diff) | |
| parent | 49d23722dfbdeca9a8cb66ba87104e31bb98e62f (diff) | |
| download | kernel-eaa431c101ff69612a09f7f6ffaf41d102a2195d.tar.gz kernel-eaa431c101ff69612a09f7f6ffaf41d102a2195d.tar.xz kernel-eaa431c101ff69612a09f7f6ffaf41d102a2195d.zip | |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel
Fix up conflicts:
kernel.spec
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 385f7f375..fb3f4e66e 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 @@ -1957,6 +1961,12 @@ fi %changelog * Sat Nov 20 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36.1-6.rc1 - Linux 2.6.36.1-rc1 +- Comment out upstreamed patches: + secmark-do-not-return-early-if-there-was-no-error.patch + +* 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. |