summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 13:55:03 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 13:55:03 -0400
commitf2ae91bccf2c1cd0299b38bcc5f28caac4c025df (patch)
treed3fe8454622b338f2caf47715aa6e6e5771dce9a
parent4ae7205efc898a62c41ead62adb9df78b82d360c (diff)
downloadkernel-f2ae91bccf2c1cd0299b38bcc5f28caac4c025df.tar.gz
kernel-f2ae91bccf2c1cd0299b38bcc5f28caac4c025df.tar.xz
kernel-f2ae91bccf2c1cd0299b38bcc5f28caac4c025df.zip
Linux v3.11-3070-gcb3e433
-rw-r--r--config-x86-generic2
-rw-r--r--config-x86_64-generic1
-rw-r--r--kernel.spec7
-rw-r--r--sources2
4 files changed, 9 insertions, 3 deletions
diff --git a/config-x86-generic b/config-x86-generic
index ab5cf857c..07bc900eb 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -40,6 +40,8 @@ CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_PCDP=y
CONFIG_FB_EFI=y
+# needs FB_SIMPLE to work correctly
+# CONFIG_X86_SYSFB is not set
# FIXME: 32bit only?
# CONFIG_FB_N411 is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 85f588bc1..02886ceb7 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -18,6 +18,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NR_CPUS=128
CONFIG_PHYSICAL_START=0x1000000
+CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_IA32_EMULATION=y
# CONFIG_IA32_AOUT is not set
diff --git a/kernel.spec b/kernel.spec
index d4cf18192..a43ddc986 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 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 8
+%define gitrev 9
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2313,6 +2313,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git9.1
+- Linux v3.11-3070-gcb3e433
+
* Wed Sep 4 2013 Josh Boyer <jwboyer@fedoraproject.org>
- Update linux-firmware requirements for newer radeon firmware (rhbz 988268 972518)
diff --git a/sources b/sources
index 205a0418b..1bde0d59c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz
-1ad81513fb22af0eb0675686f3fb309d patch-3.11-git8.xz
+d8d968243a398085484dde88af01fd21 patch-3.11-git9.xz