rpms/kernel/devel .cvsignore, 1.319, 1.320 kernel-2.6.spec, 1.1839, 1.1840 linux-2.6-crashdump-common.patch, 1.6, 1.7 linux-2.6-debug-spinlock-taint.patch, 1.4, 1.5 linux-2.6-sleepon.patch, 1.1, 1.2 sources, 1.261, 1.262 linux-2.6-build-reference-discarded-opd.patch, 1.1, NONE linux-2.6-kdump-needs-not-embedded.patch, 1.1, NONE linux-2.6-ppc-compile.patch, 1.2, NONE linux-2.6-proc-vmcore-needs-not-embedded.patch, 1.1, NONE linux-2.6.15-spufs-compile.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 11 00:01:46 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5428
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch
linux-2.6-debug-spinlock-taint.patch linux-2.6-sleepon.patch
sources
Removed Files:
linux-2.6-build-reference-discarded-opd.patch
linux-2.6-kdump-needs-not-embedded.patch
linux-2.6-ppc-compile.patch
linux-2.6-proc-vmcore-needs-not-embedded.patch
linux-2.6.15-spufs-compile.patch
Log Message:
Update from Linus' tree again
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- .cvsignore 10 Jan 2006 01:45:59 -0000 1.319
+++ .cvsignore 11 Jan 2006 00:01:10 -0000 1.320
@@ -3,4 +3,4 @@
kernel-2.6.15
linux-2.6.15.tar.bz2
bcm43xx-20060106.tar.bz2
-patch-2.6.15-git5a.bz2
+patch-2.6.15-git6a.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1839
retrieving revision 1.1840
diff -u -r1.1839 -r1.1840
--- kernel-2.6.spec 10 Jan 2006 02:53:27 -0000 1.1839
+++ kernel-2.6.spec 11 Jan 2006 00:01:11 -0000 1.1840
@@ -207,7 +207,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.15-git5a.bz2
+Patch1: patch-2.6.15-git6a.bz2
#Patch2: patch-2.6.16-rc1-git1.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -226,8 +226,6 @@
# 300 - 399 ppc(64)
Patch300: linux-2.6.15-default-powerpc.patch
-Patch301: linux-2.6.15-spufs-compile.patch
-Patch302: linux-2.6-ppc-compile.patch
Patch304: linux-2.6.15-mv643xx-fixes.patch
Patch305: linux-2.6-cell-mambo-drivers.patch
Patch306: linux-2.6-hvc-console.patch
@@ -254,7 +252,6 @@
#
Patch800: linux-2.6-build-nonintconfig.patch
Patch801: linux-2.6-build-userspace-headers-warning.patch
-Patch802: linux-2.6-build-reference-discarded-opd.patch
# Exec-shield.
Patch810: linux-2.6-execshield.patch
@@ -383,8 +380,6 @@
# Not patches you're too lazy for to put in the proper place.
#
-Patch10001: linux-2.6-kdump-needs-not-embedded.patch
-Patch10002: linux-2.6-proc-vmcore-needs-not-embedded.patch
Patch10003: linux-2.6-gcc41.patch
Patch10004: linux-2.6-compile-fixes.patch
@@ -633,10 +628,6 @@
#
# Default to ARCH=powerpc
%patch300 -p1
-# Fix spufs build
-%patch301 -p1
-# Fix ppc32 build
-%patch302 -p1
# Fix the MV643xx Gigabit Ethernet driver
%patch304 -p1
# Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -679,8 +670,6 @@
%patch800 -p1
# Warn if someone tries to build userspace using kernel headers
%patch801 -p1
-# reference_discarded additions.
-%patch802 -p1
# Exec shield
%patch810 -p1
@@ -777,7 +766,7 @@
#
# Various upstream NFS/NFSD fixes.
#
-%patch1200 -p1
+#%patch1200 -p1
# kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports
%patch1201 -p1
# Fix badness.
@@ -893,8 +882,6 @@
#
# misc small stuff to make things compile or otherwise improve performance
#
-%patch10001 -p1
-%patch10002 -p1
%patch10003 -p1
%patch10004 -p1
@@ -1373,6 +1360,9 @@
%endif
%changelog
+* Wed Jan 11 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e)
+
* Tue Jan 10 2006 David Woodhouse <dwmw2 at redhat.com>
- 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7)
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-crashdump-common.patch 30 Dec 2005 05:22:33 -0000 1.6
+++ linux-2.6-crashdump-common.patch 11 Jan 2006 00:01:28 -0000 1.7
@@ -779,14 +779,14 @@
--- linux-2.6.12/kernel/Makefile.orig 2005-08-18 12:41:10.000000000 -0400
+++ linux-2.6.12/kernel/Makefile 2005-08-18 14:23:59.000000000 -0400
@@ -7,7 +7,7 @@
- sysctl.o capability.o ptrace.o timer.o user.o \
signal.o sys.o kmod.o workqueue.o pid.o \
rcupdate.o intermodule.o extable.o params.o posix-timers.o \
-- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o
-+ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o
+ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
+- hrtimer.o
++ hrtimer.o dump.o
+ obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
obj-$(CONFIG_FUTEX) += futex.o
- obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
--- linux-2.6.12/kernel/sched.c.orig 2005-08-18 12:41:14.000000000 -0400
+++ linux-2.6.12/kernel/sched.c 2005-08-18 14:32:27.000000000 -0400
@@ -4177,6 +4177,8 @@
linux-2.6-debug-spinlock-taint.patch:
spinlock_debug.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
Index: linux-2.6-debug-spinlock-taint.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-spinlock-taint.patch 30 Dec 2005 21:10:37 -0000 1.4
+++ linux-2.6-debug-spinlock-taint.patch 11 Jan 2006 00:01:29 -0000 1.5
@@ -1,61 +1,59 @@
-Print info about tainting in the spinlock debug printks.
-
---- linux-2.6.14/lib/spinlock_debug.c~ 2005-12-21 11:42:59.000000000 -0500
-+++ linux-2.6.14/lib/spinlock_debug.c 2005-12-21 11:44:12.000000000 -0500
+--- linux-2.6.15/lib/spinlock_debug.c~ 2006-01-10 20:46:43.000000000 +0000
++++ linux-2.6.15/lib/spinlock_debug.c 2006-01-10 20:52:49.000000000 +0000
@@ -19,9 +19,9 @@ static void spin_bug(spinlock_t *lock, c
if (xchg(&print_once, 0)) {
if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
owner = lock->owner;
-- printk("BUG: spinlock %s on CPU#%d, %s/%d\n",
-+ printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
+- printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
++ printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
msg, raw_smp_processor_id(),
- current->comm, current->pid);
-+ current->comm, current->pid, print_tainted());
- printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",
++ current->comm, current->pid, print_tainted());
+ printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
+ ".owner_cpu: %d\n",
lock, lock->magic,
- owner ? owner->comm : "<none>",
-@@ -78,9 +78,9 @@ static void __spin_lock_debug(spinlock_t
- /* lockup suspected: */
+@@ -80,9 +80,9 @@ static void __spin_lock_debug(spinlock_t
if (print_once) {
print_once = 0;
-- printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n",
-+ printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n",
+ printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
+- "%s/%d, %p\n",
++ "%s/%d, %p (%s)\n",
raw_smp_processor_id(), current->comm,
- current->pid, lock);
+ current->pid, lock, print_tainted());
dump_stack();
}
}
-@@ -120,9 +120,9 @@ static void rwlock_bug(rwlock_t *lock, c
+@@ -122,9 +122,9 @@ static void rwlock_bug(rwlock_t *lock, c
static long print_once = 1;
if (xchg(&print_once, 0)) {
-- printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg,
-+ printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg,
- raw_smp_processor_id(), current->comm,
+- printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
++ printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n",
+ msg, raw_smp_processor_id(), current->comm,
- current->pid, lock);
+ current->pid, lock, print_tainted());
dump_stack();
#ifdef CONFIG_SMP
/*
-@@ -149,9 +149,9 @@ static void __read_lock_debug(rwlock_t *
- /* lockup suspected: */
+@@ -152,9 +152,9 @@ static void __read_lock_debug(rwlock_t *
if (print_once) {
print_once = 0;
-- printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n",
-+ printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n",
+ printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, "
+- "%s/%d, %p\n",
++ "%s/%d, %p (%s)\n",
raw_smp_processor_id(), current->comm,
- current->pid, lock);
+ current->pid, lock, print_tainted());
dump_stack();
}
}
-@@ -221,9 +221,9 @@ static void __write_lock_debug(rwlock_t
- /* lockup suspected: */
+@@ -225,9 +225,9 @@ static void __write_lock_debug(rwlock_t
if (print_once) {
print_once = 0;
-- printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n",
-+ printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n",
+ printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, "
+- "%s/%d, %p\n",
++ "%s/%d, %p (%s)\n",
raw_smp_processor_id(), current->comm,
- current->pid, lock);
+ current->pid, lock, print_tainted());
linux-2.6-sleepon.patch:
drivers/block/DAC960.c | 12 +++++++++++-
drivers/net/tokenring/ibmtr.c | 9 ++++++++-
include/linux/wait.h | 6 +++---
kernel/sched.c | 28 +++++++++++++++-------------
4 files changed, 37 insertions(+), 18 deletions(-)
Index: linux-2.6-sleepon.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sleepon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sleepon.patch 15 Oct 2005 01:13:22 -0000 1.1
+++ linux-2.6-sleepon.patch 11 Jan 2006 00:01:30 -0000 1.2
@@ -140,32 +140,3 @@
current->state = TASK_UNINTERRUPTIBLE;
SLEEP_ON_HEAD
-diff -urNp --exclude-from=/home/davej/.exclude linux-1060/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c
---- linux-1060/net/sunrpc/clnt.c
-+++ linux-1070/net/sunrpc/clnt.c
-@@ -223,17 +223,24 @@ out_no_clnt:
- int
- rpc_shutdown_client(struct rpc_clnt *clnt)
- {
-+ wait_queue_t __wait;
-+ init_waitqueue_entry(&__wait, current);
- dprintk("RPC: shutting down %s client for %s, tasks=%d\n",
- clnt->cl_protname, clnt->cl_server,
- atomic_read(&clnt->cl_users));
-
-+ add_wait_queue(&destroy_wait, &__wait);
-+ set_current_state(TASK_UNINTERRUPTIBLE);
- while (atomic_read(&clnt->cl_users) > 0) {
- /* Don't let rpc_release_client destroy us */
- clnt->cl_oneshot = 0;
- clnt->cl_dead = 0;
- rpc_killall_tasks(clnt);
-- sleep_on_timeout(&destroy_wait, 1*HZ);
-+ schedule_timeout(1*HZ);
-+ set_current_state(TASK_UNINTERRUPTIBLE);
- }
-+ current->state = TASK_RUNNING;
-+ remove_wait_queue(&destroy_wait, &__wait);
-
- if (atomic_read(&clnt->cl_users) < 0) {
- printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n",
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- sources 10 Jan 2006 01:45:59 -0000 1.261
+++ sources 11 Jan 2006 00:01:30 -0000 1.262
@@ -1,4 +1,3 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2
-1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2
-82d5bf398cb12769fb2431964045982f patch-2.6.15-git5a.bz2
+0ec61ec3ed52b5aa640cacd23338e0ea patch-2.6.15-git6a.bz2
--- linux-2.6-build-reference-discarded-opd.patch DELETED ---
--- linux-2.6-kdump-needs-not-embedded.patch DELETED ---
--- linux-2.6-ppc-compile.patch DELETED ---
--- linux-2.6-proc-vmcore-needs-not-embedded.patch DELETED ---
--- linux-2.6.15-spufs-compile.patch DELETED ---
More information about the fedora-cvs-commits
mailing list