rpms/kernel/devel patch-2.6.14-rc1-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.224, 1.225 kernel-2.6.spec, 1.1555, 1.1556 linux-2.6-debug-taint-check.patch, 1.1, 1.2 linux-2.6.9-module_version.patch, 1.16, 1.17 sources, 1.168, 1.169 linux-2.6-vm-slab-bug.patch, 1.1, NONE linux-2.6.13-audit-git.patch, 1.3, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 16 09:10:00 UTC 2005


Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-debug-taint-check.patch 
	linux-2.6.9-module_version.patch sources 
Added Files:
	patch-2.6.14-rc1-git2.bz2.sign 
Removed Files:
	linux-2.6-vm-slab-bug.patch linux-2.6.13-audit-git.patch 
Log Message:
rc1-git2



--- NEW FILE patch-2.6.14-rc1-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBDKkDwyGugalF9Dw4RAsYqAJ48JqnMk/oizMimv9cpbiXp87ND1ACfRnOE
yG2cJ/X1uiZf02gwsS4+z04=
=iVBY
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- .cvsignore	13 Sep 2005 05:03:56 -0000	1.224
+++ .cvsignore	16 Sep 2005 09:09:54 -0000	1.225
@@ -7,3 +7,4 @@
 kernel-2.6.13
 linux-2.6.13.tar.bz2
 patch-2.6.14-rc1.bz2
+patch-2.6.14-rc1-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1555
retrieving revision 1.1556
diff -u -r1.1555 -r1.1556
--- kernel-2.6.spec	14 Sep 2005 19:37:54 -0000	1.1555
+++ kernel-2.6.spec	16 Sep 2005 09:09:55 -0000	1.1556
@@ -216,11 +216,10 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.14-rc1.bz2
-#Patch2: patch-2.6.14-rc1-git1.bz2
+Patch2: patch-2.6.14-rc1-git2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
-Patch101: linux-2.6.13-audit-git.patch
 
 # 200 - 299   x86(-64)
 
@@ -345,7 +344,6 @@
 # VM bits.
 Patch2000: linux-2.6.9-vm-oomkiller-debugging.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
-Patch2002: linux-2.6-vm-slab-bug.patch
 
 
 #
@@ -557,7 +555,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -571,7 +569,6 @@
 # Architecture patches
 #
 %patch100 -p1
-%patch101 -p1
 
 #
 # x86(-64)
@@ -778,9 +775,6 @@
 %patch2000 -p1
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
-# Fix BUG() in slab.c
-%patch2002 -p1
-
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -1250,6 +1244,9 @@
 %endif
 
 %changelog
+* Fri Sep 16 2005 Dave Jones <davej at redhat.com>
+- 2.6.14-rc1-git2
+
 * Wed Sep 14 2005 Dave Jones <davej at redhat.com>
 - Fix bug in mm/slab.c (#168258)
 

linux-2.6-debug-taint-check.patch:
 linux-2.6.11/arch/i386/kernel/traps.c |    5 ++++-
 linux-2.6.11/include/linux/kernel.h   |    1 +
 linux-2.6.11/kernel/panic.c           |    7 +++++++
 linux-2.6.11/mm/slab.c                |   12 +++++++++++-
 linux-2.6.13/arch/i386/kernel/traps.c |    7 ++++---
 5 files changed, 27 insertions(+), 5 deletions(-)

Index: linux-2.6-debug-taint-check.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-taint-check.patch	8 Aug 2005 22:10:40 -0000	1.1
+++ linux-2.6-debug-taint-check.patch	16 Sep 2005 09:09:55 -0000	1.2
@@ -56,3 +56,20 @@
  	}
  	printk("\n");
  }
+--- linux-2.6.13/arch/i386/kernel/traps.c~	2005-09-15 13:55:11.000000000 -0400
++++ linux-2.6.13/arch/i386/kernel/traps.c	2005-09-15 13:57:32.000000000 -0400
+@@ -184,10 +184,11 @@ void show_stack(struct task_struct *task
+ 			break;
+ 		if (i && ((i % 8) == 0))
+ 			printk("\n       ");
+-		if ((check_tainted() != 0) && (i==0))
++		if ((check_tainted() != 0) && (i==0)) {
+ 			printk("badc0ded ");
+-		else
+-			printk("%08lx ", *stack++);
++			i++;
++		}
++		printk("%08lx ", *stack++);
+ 	}
+ 	printk("\nCall Trace:\n");
+ 	show_trace(task, esp);

linux-2.6.9-module_version.patch:
 linux-1720/drivers/block/DAC960.c           |    1 +
 linux-1720/drivers/block/cpqarray.c         |    1 +
 linux-1720/drivers/message/fusion/mptbase.c |    1 +
 linux-1720/drivers/net/b44.c                |    1 +
 linux-1720/drivers/net/ns83820.c            |    1 +
 linux-1720/drivers/net/tg3.c                |    1 +
 linux-1720/drivers/scsi/gdth.c              |    1 +
 linux-2.6.13/drivers/block/cciss.c          |    1 +
 8 files changed, 8 insertions(+)

Index: linux-2.6.9-module_version.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-module_version.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6.9-module_version.patch	24 Aug 2005 18:32:59 -0000	1.16
+++ linux-2.6.9-module_version.patch	16 Sep 2005 09:09:55 -0000	1.17
@@ -1,13 +1,13 @@
---- linux-2.6.12/drivers/block/cciss.c~	2005-06-28 12:59:45.000000000 -0400
-+++ linux-2.6.12/drivers/block/cciss.c	2005-06-28 13:00:25.000000000 -0400
-@@ -55,6 +55,7 @@ MODULE_AUTHOR("Hewlett-Packard Company")
- MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.6");
+--- linux-2.6.13/drivers/block/cciss.c~	2005-09-16 04:56:37.000000000 -0400
++++ linux-2.6.13/drivers/block/cciss.c	2005-09-16 04:56:47.000000000 -0400
+@@ -56,6 +56,7 @@ MODULE_DESCRIPTION("Driver for HP Contro
  MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
- 			" SA6i P600 P800 E400 E300");
-+MODULE_VERSION("2.6.6");
+ 			" SA6i P600 P800 P400 P400i E200 E200i");
  MODULE_LICENSE("GPL");
++MODULE_VERSION("2.6.8");
  
  #include "cciss_cmd.h"
+ #include "cciss.h"
 diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/block/cpqarray.c linux-1720/drivers/block/cpqarray.c
 --- linux-1700/drivers/block/cpqarray.c
 +++ linux-1720/drivers/block/cpqarray.c


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- sources	13 Sep 2005 05:04:08 -0000	1.168
+++ sources	16 Sep 2005 09:09:55 -0000	1.169
@@ -1,2 +1,3 @@
 560f5fadf59f172973e67939868a4cae  linux-2.6.13.tar.bz2
 40ec299813438ec5c066d08acf539570  patch-2.6.14-rc1.bz2
+6f25e0986eaf1c754cc1c6f3389bb872  patch-2.6.14-rc1-git2.bz2


--- linux-2.6-vm-slab-bug.patch DELETED ---


--- linux-2.6.13-audit-git.patch DELETED ---




More information about the fedora-cvs-commits mailing list