From af856217e097ba4c16dc1e636138446a02970805 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 28 Mar 2012 12:55:08 -0400 Subject: Move 9p modules back to main package for KVM (rhbz 807733) --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index a2b84718..a50a8afc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2307,6 +2307,9 @@ fi # ||----w | # || || %changelog +* Wed Mar 28 2012 Josh Boyer +- Move 9p modules back to main package for KVM (rhbz 807733) + * Wed Mar 28 2012 Justin M. Forbes - 3.4.0-0.rc0.git3.1 - Linux v3.3-7919-g6658a69 -- cgit From 993b5199f8d24787786ef33da16097419ee9796d Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 29 Mar 2012 10:58:35 -0400 Subject: Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075) --- kernel.spec | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index a50a8afc..f1a7817e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -652,6 +652,7 @@ Patch09: linux-2.6-upstream-reverts.patch Patch100: taint-vbox.patch Patch160: linux-2.6-32bit-mmap-exec-randomization.patch Patch161: linux-2.6-i386-nx-emulation.patch +Patch162: nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch Patch390: linux-2.6-defaults-acpi-video.patch Patch391: linux-2.6-acpi-video-dos.patch @@ -1307,6 +1308,7 @@ ApplyPatch taint-vbox.patch # x86(-64) ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch ApplyPatch linux-2.6-i386-nx-emulation.patch +ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch # # ARM @@ -2307,6 +2309,9 @@ fi # ||----w | # || || %changelog +* Thu Mar 29 2012 Josh Boyer +- Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075) + * Wed Mar 28 2012 Josh Boyer - Move 9p modules back to main package for KVM (rhbz 807733) -- cgit