Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

namespaces Kconfig: move namespace menu location after the cgroup

We have the namespaces as a menuconfig like the cgroup. The cgroup and
the namespace are two base bricks for the containers.

It is more logical to put the namespace menu right after the cgroup menu.

Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Daniel Lezcano and committed by
Linus Torvalds
7af37bec eef691b3

+52 -52
+52 -52
init/Kconfig
··· 675 675 676 676 endif # CGROUPS 677 677 678 - config MM_OWNER 679 - bool 680 - 681 - config SYSFS_DEPRECATED 682 - bool "enable deprecated sysfs features to support old userspace tools" 683 - depends on SYSFS 684 - default n 685 - help 686 - This option adds code that switches the layout of the "block" class 687 - devices, to not show up in /sys/class/block/, but only in 688 - /sys/block/. 689 - 690 - This switch is only active when the sysfs.deprecated=1 boot option is 691 - passed or the SYSFS_DEPRECATED_V2 option is set. 692 - 693 - This option allows new kernels to run on old distributions and tools, 694 - which might get confused by /sys/class/block/. Since 2007/2008 all 695 - major distributions and tools handle this just fine. 696 - 697 - Recent distributions and userspace tools after 2009/2010 depend on 698 - the existence of /sys/class/block/, and will not work with this 699 - option enabled. 700 - 701 - Only if you are using a new kernel on an old distribution, you might 702 - need to say Y here. 703 - 704 - config SYSFS_DEPRECATED_V2 705 - bool "enabled deprecated sysfs features by default" 706 - default n 707 - depends on SYSFS 708 - depends on SYSFS_DEPRECATED 709 - help 710 - Enable deprecated sysfs by default. 711 - 712 - See the CONFIG_SYSFS_DEPRECATED option for more details about this 713 - option. 714 - 715 - Only if you are using a new kernel on an old distribution, you might 716 - need to say Y here. Even then, odds are you would not need it 717 - enabled, you can always pass the boot option if absolutely necessary. 718 - 719 - config RELAY 720 - bool "Kernel->user space relay support (formerly relayfs)" 721 - help 722 - This option enables support for relay interface support in 723 - certain file systems (such as debugfs). 724 - It is designed to provide an efficient mechanism for tools and 725 - facilities to relay large amounts of data from kernel space to 726 - user space. 727 - 728 - If unsure, say N. 729 - 730 678 menuconfig NAMESPACES 731 679 bool "Namespaces support" if EMBEDDED 732 680 default !EMBEDDED ··· 727 779 of the network stack. 728 780 729 781 endif # NAMESPACES 782 + 783 + config MM_OWNER 784 + bool 785 + 786 + config SYSFS_DEPRECATED 787 + bool "enable deprecated sysfs features to support old userspace tools" 788 + depends on SYSFS 789 + default n 790 + help 791 + This option adds code that switches the layout of the "block" class 792 + devices, to not show up in /sys/class/block/, but only in 793 + /sys/block/. 794 + 795 + This switch is only active when the sysfs.deprecated=1 boot option is 796 + passed or the SYSFS_DEPRECATED_V2 option is set. 797 + 798 + This option allows new kernels to run on old distributions and tools, 799 + which might get confused by /sys/class/block/. Since 2007/2008 all 800 + major distributions and tools handle this just fine. 801 + 802 + Recent distributions and userspace tools after 2009/2010 depend on 803 + the existence of /sys/class/block/, and will not work with this 804 + option enabled. 805 + 806 + Only if you are using a new kernel on an old distribution, you might 807 + need to say Y here. 808 + 809 + config SYSFS_DEPRECATED_V2 810 + bool "enabled deprecated sysfs features by default" 811 + default n 812 + depends on SYSFS 813 + depends on SYSFS_DEPRECATED 814 + help 815 + Enable deprecated sysfs by default. 816 + 817 + See the CONFIG_SYSFS_DEPRECATED option for more details about this 818 + option. 819 + 820 + Only if you are using a new kernel on an old distribution, you might 821 + need to say Y here. Even then, odds are you would not need it 822 + enabled, you can always pass the boot option if absolutely necessary. 823 + 824 + config RELAY 825 + bool "Kernel->user space relay support (formerly relayfs)" 826 + help 827 + This option enables support for relay interface support in 828 + certain file systems (such as debugfs). 829 + It is designed to provide an efficient mechanism for tools and 830 + facilities to relay large amounts of data from kernel space to 831 + user space. 832 + 833 + If unsure, say N. 730 834 731 835 config BLK_DEV_INITRD 732 836 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"