[kernel/f19] Linux v3.9-rc5

Tue Apr 2 12:41:46 UTC 2013

commit 4c578540af6ca542bab88582c9cf6dd02b4cfb10
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Apr 2 07:34:22 2013 -0500

    Linux v3.9-rc5

 HID-usbhid-quirk-for-MSI-GX680R-led-panel.patch    |   45 ----------------
 ...sbhid-quirk-for-Realtek-Multi-card-reader.patch |   45 ----------------
 config-generic                                     |    1 +
 config-x86-generic                                 |    2 +
 ...state-max-is-in-the-max-variable-who-knew.patch |   42 ---------------
 cpufreq-intel-pstate-validate-msrs.patch           |   56 --------------------
 htmldoc-build-fix.patch                            |   16 ++++++
 kernel.spec                                        |   30 +++-------
 serial-460800.patch                                |    4 +-
 sources                                            |    2 +-
 10 files changed, 31 insertions(+), 212 deletions(-)
---

diff --git a/config-generic b/config-generic
index a7bfa4d..d0000b4 100644
--- a/config-generic
+++ b/config-generic
@@ -2152,6 +2152,7 @@ CONFIG_TELCLOCK=m
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
diff --git a/config-x86-generic b/config-x86-generic
index 3ac8523..bab32a8 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -37,6 +37,8 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_VARS=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
 
diff --git a/htmldoc-build-fix.patch b/htmldoc-build-fix.patch
new file mode 100644
index 0000000..424246c
--- /dev/null
+++ b/htmldoc-build-fix.patch
@@ -0,0 +1,16 @@
+htmldocs will fail, because device-drivers.tmpl references the
+non-existant file 8250.c (which got renamed to 8250_core.c)
+
+Signed-off-by: Kyle McMartin <kyle at redhat.com>
+
+--- a/Documentation/DocBook/device-drivers.tmpl
++++ b/Documentation/DocBook/device-drivers.tmpl
+@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
+   <chapter id="uart16x50">
+      <title>16x50 UART Driver</title>
+ !Edrivers/tty/serial/serial_core.c
+-!Edrivers/tty/serial/8250/8250.c
++!Edrivers/tty/serial/8250/8250_core.c
+   </chapter>
+ 
+   <chapter id="fbdev">
diff --git a/kernel.spec b/kernel.spec
index 9bebe91..1d986fa 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
@@ -93,7 +93,7 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 5
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -737,24 +737,17 @@ Patch21276: mac80211-Dont-restart-sta-timer-if-not-running.patch
 #rhbz 859282
 Patch21275: VMX-x86-handle-host-TSC-calibration-failure.patch
 
-#rhbz 907221
-Patch21277: HID-usbhid-quirk-for-MSI-GX680R-led-panel.patch
-
-#rhbz 806587
-Patch21278: HID-usbhid-quirk-for-Realtek-Multi-card-reader.patch
-
 Patch22000: weird-root-dentry-name-debug.patch
 Patch22010: debug-idle-sched-warn-once.patch
 
 #selinux ptrace child permissions
 Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
 
-Patch23000: cpufreq-intel-pstate-validate-msrs.patch
-Patch23001: cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
-
 #rhbz 927469
 Patch23006: fix-child-thread-introspection.patch
 
+Patch23007: htmldoc-build-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1423,10 +1416,6 @@ ApplyPatch debug-idle-sched-warn-once.patch
 #selinux ptrace child permissions
 ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
 
-# rhbz 922923
-ApplyPatch cpufreq-intel-pstate-validate-msrs.patch
-ApplyPatch cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
-
 #rhbz 859485
 ApplyPatch vt-Drop-K_OFF-for-VC_MUTE.patch
 
@@ -1452,15 +1441,11 @@ ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
 #rhbz 920218
 ApplyPatch mac80211-Dont-restart-sta-timer-if-not-running.patch
 
-#rhbz 907221
-ApplyPatch HID-usbhid-quirk-for-MSI-GX680R-led-panel.patch
-
-#rhbz 806587
-ApplyPatch HID-usbhid-quirk-for-Realtek-Multi-card-reader.patch
-
 #rhbz 927469
 ApplyPatch fix-child-thread-introspection.patch
 
+ApplyPatch htmldoc-build-fix.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2293,6 +2278,9 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 02 2013 Justin M. Forbes <jforbes at redhat.com> - 3.9.0-0.rc5.git0.1
+- Linux v3.9-rc5
+
 * Mon Apr 01 2013 Josh Boyer <jwboyer at redhat.com>
 - Enable CONFIG_MCE_INJECT (rhbz 927353)
 
diff --git a/serial-460800.patch b/serial-460800.patch
index 0e68378..bdae70e 100644
--- a/serial-460800.patch
+++ b/serial-460800.patch
@@ -1,7 +1,7 @@
 diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
 index 2209620..659c1bb 100644
---- a/drivers/tty/serial/8250/8250.c
-+++ b/drivers/tty/serial/8250/8250.c
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
 @@ -7,6 +7,9 @@
   *
   *  Copyright (C) 2001 Russell King.
diff --git a/sources b/sources
index 24acb5b..9eae90e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1c738edfc54e7c65faeb90c436104e2f  linux-3.8.tar.xz
-8106d3a1c94ea6eb726e62c167a794da  patch-3.9-rc4.xz
+0f6de99ae977b38feb460fbd4e1288a3  patch-3.9-rc5.xz
