The patch titled
pi-futex-rt-mutex-core merge fix
has been added to the -mm tree. Its filename is
pi-futex-rt-mutex-core-merge-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pi-futex-rt-mutex-core merge fix
From: Valdis.Kletnieks@xxxxxx
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@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/sysctl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/linux/sysctl.h~pi-futex-rt-mutex-core-merge-fix include/linux/sysctl.h
--- a/include/linux/sysctl.h~pi-futex-rt-mutex-core-merge-fix
+++ a/include/linux/sysctl.h
@@ -152,7 +152,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,
};
_
Patches currently in -mm which might be from valdis.kletnieks@xxxxxx are
git-kbuild.patch
pi-futex-rt-mutex-core-merge-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
