The patch titled Subject: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE has been removed from the -mm tree. Its filename was ipc-add-sysctl-to-specify-desired-next-object-id-wrap-new-sysctls-for-criu-inside-config_checkpoint_restore.patch This patch was dropped because it was folded into ipc-add-sysctl-to-specify-desired-next-object-id.patch ------------------------------------------------------ From: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx> Subject: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE Wrap "msg_next_id", "sem_next_id" and "shm_next_id" inside CONFIG_CHECKPOINT_RESTORE macro. Signed-off-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx> Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/ipc_sysctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN ipc/ipc_sysctl.c~ipc-add-sysctl-to-specify-desired-next-object-id-wrap-new-sysctls-for-criu-inside-config_checkpoint_restore ipc/ipc_sysctl.c --- a/ipc/ipc_sysctl.c~ipc-add-sysctl-to-specify-desired-next-object-id-wrap-new-sysctls-for-criu-inside-config_checkpoint_restore +++ a/ipc/ipc_sysctl.c @@ -158,7 +158,9 @@ static int proc_ipcauto_dointvec_minmax( static int zero; static int one = 1; +#ifdef CONFIG_CHECKPOINT_RESTORE static int int_max = INT_MAX; +#endif static struct ctl_table ipc_kern_table[] = { { @@ -228,6 +230,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, }, +#ifdef CONFIG_CHECKPOINT_RESTORE { .procname = "sem_next_id", .data = &init_ipc_ns.ids[IPC_SEM_IDS].next_id, @@ -255,6 +258,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &int_max, }, +#endif {} }; _ Patches currently in -mm which might be from skinsbursky@xxxxxxxxxxxxx are origin.patch linux-next.patch ipc-remove-forced-assignment-of-selected-message.patch ipc-add-sysctl-to-specify-desired-next-object-id.patch ipc-add-sysctl-to-specify-desired-next-object-id-documentation-update-sysctl-kerneltxt.patch ipc-message-queue-receive-cleanup.patch ipc-message-queue-receive-cleanup-checkpatch-fixes.patch ipc-message-queue-copy-feature-introduced.patch ipc-message-queue-copy-feature-introduced-remove-redundant-msg_copy-check.patch ipc-message-queue-copy-feature-introduced-cleanup-do_msgrcv-aroung-msg_copy-feature.patch selftests-ipc-message-queue-copy-feature-test.patch selftests-ipc-message-queue-copy-feature-test-update.patch ipc-simplify-free_copy-call.patch ipc-convert-prepare_copy-from-macro-to-function.patch ipc-convert-prepare_copy-from-macro-to-function-fix.patch ipc-simplify-message-copying.patch ipc-add-more-comments-to-message-copying-related-code.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