lkml.org 
[lkml]   [2006]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] pi-futex-rt-mutex-core-merge.patch (was Re: 2.6.17-mm1
From
Date
On Wed, 21 Jun 2006 03:48:57 PDT, Andrew Morton said:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17/2.6.17-mm1/

pi-futex-rt-mutex-core.patch has what looks like a merge error in it.

Patch to clean it up attached.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>

--- linux-2.6.17-mm1/include/linux/sysctl.h.fix1 2006-06-21 13:24:32.000000000 -0400
+++ linux-2.6.17-mm1/include/linux/sysctl.h 2006-06-21 14:16:46.000000000 -0400
@@ -153,7 +153,7 @@ enum
KERN_NMI_WATCHDOG=74, /* int: enable/disable nmi watchdog */
KERN_PANIC_ON_NMI=75, /* int: whether we will panic on an unrecovered */
KERN_STOP_ON_CPU_LOST=76, /* int: SIGSTOP when a task losts its cpus */
- KERN_MAX_LOCK_DEPTH=76,
+ KERN_MAX_LOCK_DEPTH=77,
};



[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2006-06-21 20:24    [W:0.398 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site