pi-futex-patchset-v4.patch (was Re: 2.6.17-rc3-mm1

[Valdis . Kletnieks]

On Mon, 01 May 2006 01:47:37 PDT, Andrew Morton said:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17-rc3/2.6.17-rc3-mm1/

Seen in pi-futex-patchset-v4.patch:

diff -puN include/linux/sysctl.h~pi-futex-patchset-v4 include/linux/sysctl.h
--- devel/include/linux/sysctl.h~pi-futex-patchset-v4   2006-04-30 00:17:10.000000000 -0700
+++ devel-akpm/include/linux/sysctl.h   2006-04-30 00:17:39.000000000 -0700
@@ -148,11 +148,11 @@ enum
        KERN_SPIN_RETRY=70,     /* int: number of spinlock retries */
        KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
        KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
-       KERN_COMPAT_LOG=73,     /* int: print compat layer  messages */
+       KERN_COMPAT_LOG=73,     /* int: print compat layer messages */
+       KERN_MAX_LOCK_DEPTH=73,
 };
 
Mismerge? I suspect MAX_LOG wants to be =74?

Attachment: pgp00000.pgp
Description: PGP signature