summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic2
-rw-r--r--config-nodebug2
-rw-r--r--kernel.spec7
-rw-r--r--sources2
4 files changed, 9 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index 3cb093051..fb1d92b56 100644
--- a/config-generic
+++ b/config-generic
@@ -2552,7 +2552,7 @@ CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
CONFIG_DRM_UDL=m
CONFIG_DRM_VMWGFX=m
-# CONFIG_DRM_VMWGFX_FBCON is not set
+CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VGEM=m
#
diff --git a/config-nodebug b/config-nodebug
index de1518e39..6b8b48fc6 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -100,7 +100,7 @@ CONFIG_KDB_KEYBOARD=y
# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
diff --git a/kernel.spec b/kernel.spec
index fd524a8c5..d4ef2125c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 6
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2315,6 +2315,11 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 05 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git2.1
+- Linux v3.8-rc6-62-gfe547d7
+- Enable CONFIG_DRM_VMWGFX_FBCON (rhbz 907620)
+- Enable CONFIG_DETECT_HUNG_TASK
+
* Mon Feb 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git1.1
- Linux v3.8-rc6-22-g6edacf0
- Enable CONFIG_EXT4_DEBUG
diff --git a/sources b/sources
index 37780ebc4..ae7708c3c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
21223369d682bcf44bcdfe1521095983 linux-3.7.tar.xz
86fddbbbda8b9d7432ef479d055968e4 patch-3.8-rc6.xz
-acbf858e181ed7781ddcf1e460b94837 patch-3.8-rc6-git1.xz
+47c13c925f34642b05ed4524d62257ec patch-3.8-rc6-git2.xz