diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-09-23 21:16:09 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-09-23 21:16:09 -0400 |
| commit | 9e5584957c9cc106f9775d9fdc52a8d1300d749e (patch) | |
| tree | 38c4c246b9df602d32cb4637896938847be7fb3a /kernel.spec | |
| parent | 9e0d2f655e4b18a995d14107e7f7289f4e8aa65d (diff) | |
| download | kernel-9e5584957c9cc106f9775d9fdc52a8d1300d749e.tar.gz kernel-9e5584957c9cc106f9775d9fdc52a8d1300d749e.tar.xz kernel-9e5584957c9cc106f9775d9fdc52a8d1300d749e.zip | |
Linux 2.6.36-rc5-git4
Drop merged patches:
fix-icebp-breakpoints.patch
linux-2.6.35.4-virtio_console-fix-poll.patch
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index e9c66ac6b..16258e4a5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 25 +%global baserelease 26 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -604,8 +604,6 @@ Patch30: linux-2.6-tracehook.patch Patch31: linux-2.6-utrace.patch Patch32: linux-2.6-utrace-ptrace.patch -Patch100: fix-icebp-breakpoints.patch - Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch Patch160: linux-2.6-32bit-mmap-exec-randomization.patch @@ -648,7 +646,6 @@ Patch800: linux-2.6-crash-driver.patch # virt + ksm patches Patch1555: fix_xen_guest_on_old_EC2.patch -Patch1556: linux-2.6.35.4-virtio_console-fix-poll.patch # DRM Patch1801: drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch @@ -1141,7 +1138,6 @@ ApplyPatch linux-2.6-utrace-ptrace.patch # Architecture patches # x86(-64) -ApplyPatch fix-icebp-breakpoints.patch # # Intel IOMMU @@ -1251,7 +1247,6 @@ ApplyPatch linux-2.6-crash-driver.patch # Assorted Virt Fixes ApplyPatch fix_xen_guest_on_old_EC2.patch -ApplyPatch linux-2.6.35.4-virtio_console-fix-poll.patch #ApplyPatch drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch #ApplyPatch revert-drm-kms-toggle-poll-around-switcheroo.patch @@ -1922,6 +1917,12 @@ fi # || || %changelog +* Thu Sep 23 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36-0.26.rc5.git4 +- Linux 2.6.36-rc5-git4 +- Drop merged patches: + fix-icebp-breakpoints.patch + linux-2.6.35.4-virtio_console-fix-poll.patch + * Thu Sep 23 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.25.rc5 - Add s390 vdso AFTER_LINK to Roland's linux-2.6-makefile-after_link.patch |