diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-07-10 09:43:44 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-07-10 11:49:54 -0400 |
| commit | e04b212cc5b43cda75aee2b6efa65c9234138713 (patch) | |
| tree | 5de85a3f57663c3396d6a17e3119b780d74184b7 /kernel.spec | |
| parent | 75d6a46098fa643e6cceddd2763f840c258b1055 (diff) | |
| download | kernel-e04b212cc5b43cda75aee2b6efa65c9234138713.tar.gz kernel-e04b212cc5b43cda75aee2b6efa65c9234138713.tar.xz kernel-e04b212cc5b43cda75aee2b6efa65c9234138713.zip | |
update to snapshot 3.0-rc6-git6
revert CONFIG_X86_RESERVE_LOW=640, it breaks boot.
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 99d6407f9..ba11f1a7e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel} %endif @@ -691,7 +691,6 @@ Patch12204: linux-2.6-enable-more-pci-autosuspend.patch Patch12205: runtime_pm_fixups.patch Patch12303: dmar-disable-when-ricoh-multifunction.patch -Patch12304: iwlagn-fix-dma-direction.patch %endif @@ -1266,7 +1265,6 @@ ApplyPatch neuter_intel_microcode_load.patch # rhbz#605888 ApplyPatch dmar-disable-when-ricoh-multifunction.patch -ApplyPatch iwlagn-fix-dma-direction.patch # END OF PATCH APPLICATIONS @@ -1878,6 +1876,11 @@ fi # and build. %changelog +* Sun Jul 10 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc6.git6.1 +- Linux 3.0-rc6-git6 +- iwlagn-fix-dma-direction.patch: drop. +- Revert CONFIG_X86_RESERVE_LOW=640, it breaks booting on x86_64. + * Thu Jul 07 2011 Dave Jones <davej@redhat.com> - Centralise CPU_FREQ options into config-generic. Switch to using ondemand by default. (rhbz 713572) |