2009/stable/kernel/pae/kernel-pae - Merge from devel/kernel/pae/kernel-pae/

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Thu Jan 14 09:37:03 2010
New Revision: 84673

Added:
   2009/stable/kernel/pae/kernel-pae/files/kernel/0001-x86-mce-thermal-monitoring-depends-on-APIC-being-enabled.patch
      - copied unchanged from r84672, 2009/devel/kernel/pae/kernel-pae/files/kernel/0001-x86-mce-thermal-monitoring-depends-on-APIC-being-enabled.patch
   2009/stable/kernel/pae/kernel-pae/files/kernel/0002-x86-mce-Clean-up-thermal-init-by-introducing-intel_t.patch
      - copied unchanged from r84672, 2009/devel/kernel/pae/kernel-pae/files/kernel/0002-x86-mce-Clean-up-thermal-init-by-introducing-intel_t.patch
   2009/stable/kernel/pae/kernel-pae/files/kernel/linux-2.6-quota-fix-regression-with-ext3.patch
      - copied unchanged from r84672, 2009/devel/kernel/pae/kernel-pae/files/kernel/linux-2.6-quota-fix-regression-with-ext3.patch
Modified:
   2009/stable/kernel/pae/kernel-pae/   (props changed)
   2009/stable/kernel/pae/kernel-pae/comar/   (props changed)
   2009/stable/kernel/pae/kernel-pae/files/   (props changed)
   2009/stable/kernel/pae/kernel-pae/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch
   2009/stable/kernel/pae/kernel-pae/pspec.xml
Log:
Merge from devel/kernel/pae/kernel-pae/:

rev. 84580, by ozan.caglayan on 2010-01-13
Merge from default kernel: Fix MCE regression (#11923)

rev. 84671, by ozan.caglayan on 2010-01-14
quota: Fix regression on ext3 file-systems causing panic upon boot (#12008).

---
 files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch            |    2 
 files/kernel/0001-x86-mce-thermal-monitoring-depends-on-APIC-being-enabled.patch |   41 ++++++
 files/kernel/0002-x86-mce-Clean-up-thermal-init-by-introducing-intel_t.patch     |   61 ++++++++++
 files/kernel/linux-2.6-quota-fix-regression-with-ext3.patch                      |   11 +
 pspec.xml                                                                        |   13 +-
 5 files changed, 125 insertions(+), 3 deletions(-)

Modified: 2009/stable/kernel/pae/kernel-pae/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch
=================================================================
--- 2009/stable/kernel/pae/kernel-pae/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch	(original)
+++ 2009/stable/kernel/pae/kernel-pae/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch	Thu Jan 14 09:37:03 2010
@@ -44,7 +44,7 @@
 +obj-$(CONFIG_FB_I810)           += video/i810/
 +obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 +
-+bj-$(CONFIG_ATM)		+= atm/
++obj-$(CONFIG_ATM)		+= atm/
  obj-$(CONFIG_FUSION)		+= message/
  obj-$(CONFIG_FIREWIRE)		+= firewire/
  obj-y				+= ieee1394/

Modified: 2009/stable/kernel/pae/kernel-pae/pspec.xml
=================================================================
--- 2009/stable/kernel/pae/kernel-pae/pspec.xml	(original)
+++ 2009/stable/kernel/pae/kernel-pae/pspec.xml	Thu Jan 14 09:37:03 2010
@@ -38,8 +38,15 @@
 
             <!-- atkbd: Consolidate multimedia keys into one table, add OQO keyboard quirk,
                  add possibility to set forced release bitmaps through sysfs -->
-             <Patch level="1">kernel/linux-2.6-atkbd-forced-release-through-sysfs.patch</Patch>
-             <Patch level="1">kernel/linux-2.6-atkbd-oqo-forced-release-quirk.patch</Patch>
+            <Patch level="1">kernel/linux-2.6-atkbd-forced-release-through-sysfs.patch</Patch>
+            <Patch level="1">kernel/linux-2.6-atkbd-oqo-forced-release-quirk.patch</Patch>
+
+            <!-- quota: Fix regression on ext3 file-systems causing panic upon boot (#12008) -->
+            <Patch level="1">kernel/linux-2.6-quota-fix-regression-with-ext3.patch</Patch>
+
+            <!-- Fix x86 MCE malfunctioning (#11923) -->
+            <Patch level="1">kernel/0001-x86-mce-thermal-monitoring-depends-on-APIC-being-enabled.patch</Patch>
+            <Patch level="1">kernel/0002-x86-mce-Clean-up-thermal-init-by-introducing-intel_t.patch</Patch>
 
             <!-- Several sched patches for CFQ to improve desktop performance -->
             <Patch level="1">kernel/0051-sched-Turn-off-child_runs_first.patch</Patch>
@@ -389,6 +396,8 @@
                 - Version bump to 2.6.31.11,
                 - Bump TuxOnIce to the latest branch,
                 - Add Realtek staging drivers from 2.6.32 (#11957),
+                - Fix x86 MCE malfunctioning (#11923),
+                - quota: Fix regression on ext3 file-systems causing panic upon boot (#12008).
             </Comment>
             <Name>Ozan Çağlayan</Name>
             <Email>ozan at pardus.org.tr</Email>