diff --git a/config-generic b/config-generic index 73711dcda..dc81c6cf4 100644 --- a/config-generic +++ b/config-generic @@ -249,7 +249,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m +# CONFIG_BLK_DEV_NVME is not set CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 diff --git a/kernel.spec b/kernel.spec index b98f354e1..abffee221 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,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 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2274,7 +2274,10 @@ fi # ||----w | # || || %changelog -* Fri Jan 20 2012 Josh Boyer - 3.3.0-0.rc1.git0.2 +* Sun Jan 22 2012 Josh Boyer - 3.3.0-0.rc1.git0.3 +- Disable NVME as it doesn't build on 32-bit + +* Fri Jan 20 2012 Josh Boyer - 3.3.0-0.rc1.git0.2 - Disable debugging options. * Fri Jan 20 2012 Josh Boyer