rpms/kernel/devel .cvsignore, 1.332, 1.333 kernel-2.6.spec, 1.1874, 1.1875 linux-2.6-crashdump-common.patch, 1.7, 1.8 sources, 1.274, 1.275 linux-2.6-acpi-thinkpad-c2c3.patch, 1.2, NONE

Thu Jan 26 20:45:36 UTC 2006

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27415

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch 
	sources 
Removed Files:
	linux-2.6-acpi-thinkpad-c2c3.patch 
Log Message:
acpi de jour.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333

--- .cvsignore	21 Jan 2006 22:31:56 -0000	1.332
+++ .cvsignore	26 Jan 2006 20:45:32 -0000	1.333
@@ -5,3 +5,4 @@
 patch-2.6.16-rc1.bz2
 bcm43xx-20060114.tar.bz2
 patch-2.6.16-rc1-git4.bz2
+acpi-release-20060113-2.6.16-rc1.diff.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -r1.1874 -r1.1875
--- kernel-2.6.spec	26 Jan 2006 16:56:35 -0000	1.1874
+++ kernel-2.6.spec	26 Jan 2006 20:45:32 -0000	1.1875
@@ -209,6 +209,7 @@
 Patch1: patch-2.6.16-rc1.bz2
 Patch2: patch-2.6.16-rc1-git4.bz2
 Patch3: drm.patch
+Patch4: acpi-release-20060113-2.6.16-rc1.diff.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -368,9 +369,6 @@
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-vm-clear-unreclaimable.patch
 
-# ACPI patches.
-Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch
-
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx.patch
@@ -587,7 +585,10 @@
 # Update to latest upstream.
 %patch1 -p1
 %patch2 -p1
+# Backout broken DRM changes.
 %patch3 -p1 -R
+# Update ACPI
+%patch4 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -860,10 +861,6 @@
 # VM oom killer tweaks.
 %patch2002 -p1
 
-# ACPI patches.
-# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
-%patch2100 -p1
-
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1372,6 +1369,7 @@
 - Fix building of kdump kernels.
 - Fix slab corruption in network layer.
 - Make iptables work again.
+- Update ACPI to latest acpi-git tree.
 
 * Wed Jan 25 2006 Dave Jones <davej at redhat.com>
 - Disable page allocation debugging again.

linux-2.6-crashdump-common.patch:
 linux-2.6.12/Documentation/sysrq.txt         |    8 
 linux-2.6.12/arch/i386/kernel/nmi.c          |    1 
 linux-2.6.12/arch/i386/kernel/traps.c        |    3 
 linux-2.6.12/arch/i386/mm/init.c             |   47 +++++
 linux-2.6.12/arch/i386/mm/pgtable.c          |    3 
 linux-2.6.12/arch/ia64/kernel/process.c      |   30 ++-
 linux-2.6.12/arch/ia64/kernel/traps.c        |    6 
 linux-2.6.12/arch/ia64/mm/contig.c           |    3 
 linux-2.6.12/arch/ia64/mm/discontig.c        |    3 
 linux-2.6.12/arch/ia64/mm/init.c             |   90 +++++++++
 linux-2.6.12/arch/powerpc/kernel/process.c   |    1 
 linux-2.6.12/arch/powerpc/kernel/traps.c     |    3 
 linux-2.6.12/arch/powerpc/mm/mem.c           |   29 +++
 linux-2.6.12/arch/s390/kernel/traps.c        |    6 
 linux-2.6.12/arch/x86_64/kernel/process.c    |    2 
 linux-2.6.12/arch/x86_64/kernel/traps.c      |    6 
 linux-2.6.12/arch/x86_64/mm/init.c           |   32 +++
 linux-2.6.12/drivers/char/sysrq.c            |    2 
 linux-2.6.12/include/asm-generic/crashdump.h |   47 +++++
 linux-2.6.12/include/asm-i386/crashdump.h    |  123 +++++++++++++
 linux-2.6.12/include/asm-i386/kmap_types.h   |    4 
 linux-2.6.12/include/asm-ia64/crashdump.h    |   72 +++++++
 linux-2.6.12/include/asm-powerpc/crashdump.h |   61 ++++++
 linux-2.6.12/include/asm-x86_64/crashdump.h  |   86 +++++++++
 linux-2.6.12/include/linux/kernel.h          |   18 +
 linux-2.6.12/kernel/Makefile                 |    2 
 linux-2.6.12/kernel/dump.c                   |  246 +++++++++++++++++++++++++++
 linux-2.6.12/kernel/panic.c                  |    4 
 linux-2.6.12/kernel/printk.c                 |   20 ++
 linux-2.6.12/kernel/sched.c                  |    2 
 linux-2.6.13/arch/x86_64/mm/fault.c          |    1 
 linux-2.6.13/drivers/char/sysrq.c            |    5 
 32 files changed, 952 insertions(+), 14 deletions(-)

Index: linux-2.6-crashdump-common.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-crashdump-common.patch	11 Jan 2006 00:01:28 -0000	1.7
+++ linux-2.6-crashdump-common.patch	26 Jan 2006 20:45:32 -0000	1.8
@@ -396,10 +396,10 @@
  /* Values used for system_state */
  extern enum system_states {
  	SYSTEM_BOOTING,
-@@ -182,6 +193,7 @@
- 	SYSTEM_HALT,
+@@ -197,6 +197,7 @@ extern enum system_states {
  	SYSTEM_POWER_OFF,
  	SYSTEM_RESTART,
+ 	SYSTEM_SUSPEND_DISK,
 +	SYSTEM_DUMPING,
  } system_state;
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- sources	21 Jan 2006 22:32:12 -0000	1.274
+++ sources	26 Jan 2006 20:45:32 -0000	1.275
@@ -2,3 +2,4 @@
 fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
 a247c21e1202f514283ba928d9382353  patch-2.6.16-rc1-git4.bz2
+3c236ca700ac76f28c2c4e25682541a4  acpi-release-20060113-2.6.16-rc1.diff.bz2


--- linux-2.6-acpi-thinkpad-c2c3.patch DELETED ---


