summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic2
-rw-r--r--config-armv72
-rw-r--r--config-generic11
-rw-r--r--config-powerpc-generic3
-rw-r--r--config-powerpc642
-rw-r--r--config-x86-generic3
-rw-r--r--kernel.spec7
-rw-r--r--sources2
8 files changed, 28 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 310a40939..cca526caa 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -405,3 +405,5 @@ CONFIG_EXTCON_GPIO=m
# CONFIG_DVB_USB_PCTV452E is not set
# CONFIG_PINCTRL_EXYNOS is not set
CONFIG_VIRTUALIZATION=y
+
+CONFIG_XZ_DEC_ARM=y
diff --git a/config-armv7 b/config-armv7
index 09aa3ce41..91db9fda5 100644
--- a/config-armv7
+++ b/config-armv7
@@ -467,3 +467,5 @@ CONFIG_VIRTUALIZATION=y
# CONFIG_ARM_PSCI is not set
# CONFIG_ARM_HIGHBANK_CPUFREQ is not set
# CONFIG_RFKILL_REGULATOR is not set
+
+CONFIG_XZ_DEC_ARM=y
diff --git a/config-generic b/config-generic
index 39b95e091..b8dd48871 100644
--- a/config-generic
+++ b/config-generic
@@ -2929,6 +2929,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_TMIO is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_UDL is not set
+# CONFIG_FB_GOLDFISH is not set
# CONFIG_FIRMWARE_EDID is not set
@@ -3237,9 +3238,11 @@ CONFIG_HID_ROCCAT_KONE=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
CONFIG_HID_SUNPLUS=m
+CONFIG_HID_STEELSERIES=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_SMARTJOYPLUS=m
CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
@@ -3934,6 +3937,7 @@ CONFIG_LOCKUP_DETECTOR=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+# CONFIG_PANIC_ON_OOPS is not set
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
@@ -4634,6 +4638,13 @@ CONFIG_GPIO_VIPERBOARD=m
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_TEST_KSTRTOX=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
# CONFIG_XZ_DEC_TEST is not set
# CONFIG_POWER_AVS is not set
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 902dccdee..af8a3adcd 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -345,6 +345,7 @@ CONFIG_I2C_MPC=m
CONFIG_RFKILL_GPIO=m
# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+CONFIG_CRYPTO_SHA1_PPC=m
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_MCP23S08 is not set
@@ -385,3 +386,5 @@ CONFIG_FB_SSD1307=m
CONFIG_INPUT_PWM_BEEPER=m
CONFIG_BACKLIGHT_PWM=m
CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=n
+
+CONFIG_XZ_DEC_POWERPC=y
diff --git a/config-powerpc64 b/config-powerpc64
index 7c0477cf1..2a587a6fd 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -178,4 +178,4 @@ CONFIG_BPF_JIT=y
# CONFIG_PPC_ICSWX_USE_SIGILL is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
# CONFIG_PCIEPORTBUS is not set
-
+# CONFIG_PPC_TRANSACTIONAL_MEM is not set
diff --git a/config-x86-generic b/config-x86-generic
index bf884fb2e..125c9428f 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -14,6 +14,7 @@ CONFIG_I8K=m
CONFIG_SONYPI_COMPAT=y
CONFIG_MICROCODE=m
CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_INTEL_EARLY=y
CONFIG_MICROCODE_AMD=y
CONFIG_X86_MSR=y
@@ -434,6 +435,8 @@ CONFIG_INTEL_MEI_ME=y
CONFIG_VMWARE_VMCI=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_XZ_DEC_X86=y
+
CONFIG_MPILIB=y
CONFIG_PKCS7_MESSAGE_PARSER=y
CONFIG_PE_FILE_PARSER=y
diff --git a/kernel.spec b/kernel.spec
index c4c1ee139..d6e4fe608 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 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2290,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sun Feb 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git6.1
+- Linux v3.8-6988-g9e2d59a
+
* Sun Feb 24 2013 Josh Boyer <jwboyer@redhat.com>
- CVE-2013-1763 sock_diag: out-of-bounds access to sock_diag_handlers (rhbz 915052,915057)
diff --git a/sources b/sources
index 471a57303..2e6b614d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
1c738edfc54e7c65faeb90c436104e2f linux-3.8.tar.xz
-8b7f8c2e0c391b4fc0a8b419d15352db patch-3.8-git5.xz
+e2dbeca557931761a83f96e4d4286401 patch-3.8-git6.xz