diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 12:52:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 12:52:05 -0400 |
| commit | 47a469421d792dcb91a1e73319d26134241953d2 (patch) | |
| tree | 6a388381a434ebe87fed2fbb10a53ced7a7ce8b5 /init/Kconfig | |
| parent | c13c81006314ad76c2b31824960a900385601b8b (diff) | |
| parent | 51229b495340bd7a02ce3622d1966829b67054ea (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge second patchbomb from Andrew Morton:
- most of the rest of MM
- lots of misc things
- procfs updates
- printk feature work
- updates to get_maintainer, MAINTAINERS, checkpatch
- lib/ updates
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits)
exit,stats: /* obey this comment */
coredump: add __printf attribute to cn_*printf functions
coredump: use from_kuid/kgid when formatting corename
fs/reiserfs: remove unneeded cast
NILFS2: support NFSv2 export
fs/befs/btree.c: remove unneeded initializations
fs/minix: remove unneeded cast
init/do_mounts.c: add create_dev() failure log
kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
fs/efs: femove unneeded cast
checkpatch: emit "NOTE: <types>" message only once after multiple files
checkpatch: emit an error when there's a diff in a changelog
checkpatch: validate MODULE_LICENSE content
checkpatch: add multi-line handling for PREFER_ETHER_ADDR_COPY
checkpatch: suggest using eth_zero_addr() and eth_broadcast_addr()
checkpatch: fix processing of MEMSET issues
checkpatch: suggest using ether_addr_equal*()
checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files
checkpatch: remove local from codespell path
checkpatch: add --showfile to allow input via pipe to show filenames
...
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7260b27ebbab..f0c2e681b506 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1136,6 +1136,7 @@ endif # CGROUPS | |||
| 1136 | 1136 | ||
| 1137 | config CHECKPOINT_RESTORE | 1137 | config CHECKPOINT_RESTORE |
| 1138 | bool "Checkpoint/restore support" if EXPERT | 1138 | bool "Checkpoint/restore support" if EXPERT |
| 1139 | select PROC_CHILDREN | ||
| 1139 | default n | 1140 | default n |
| 1140 | help | 1141 | help |
| 1141 | Enables additional kernel features in a sake of checkpoint/restore. | 1142 | Enables additional kernel features in a sake of checkpoint/restore. |
