Commit 8a335bc631ac9c43675821580c26ebf95a3044ba
Exists in
master
and in
7 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6: ocfs2: Make OCFS2_FS depend on CONFIGFS_FS dlm: Make DLM depend on CONFIGFS_FS net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS configfs: change depends -> select SYSFS [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event [SCSI] sd: implement sd_check_events()
Showing 4 changed files Side-by-side Diff
drivers/net/Kconfig
| ... | ... | @@ -3389,8 +3389,7 @@ |
| 3389 | 3389 | |
| 3390 | 3390 | config NETCONSOLE_DYNAMIC |
| 3391 | 3391 | bool "Dynamic reconfiguration of logging targets" |
| 3392 | - depends on NETCONSOLE && SYSFS | |
| 3393 | - select CONFIGFS_FS | |
| 3392 | + depends on NETCONSOLE && SYSFS && CONFIGFS_FS | |
| 3394 | 3393 | help |
| 3395 | 3394 | This option enables the ability to dynamically reconfigure target |
| 3396 | 3395 | parameters (interface, IP addresses, port numbers, MAC addresses) |
fs/configfs/Kconfig
| 1 | 1 | config CONFIGFS_FS |
| 2 | 2 | tristate "Userspace-driven configuration filesystem" |
| 3 | - depends on SYSFS | |
| 3 | + select SYSFS | |
| 4 | 4 | help |
| 5 | - configfs is a ram-based filesystem that provides the converse | |
| 5 | + configfs is a RAM-based filesystem that provides the converse | |
| 6 | 6 | of sysfs's functionality. Where sysfs is a filesystem-based |
| 7 | 7 | view of kernel objects, configfs is a filesystem-based manager |
| 8 | 8 | of kernel objects, or config_items. |
fs/dlm/Kconfig
| 1 | 1 | menuconfig DLM |
| 2 | 2 | tristate "Distributed Lock Manager (DLM)" |
| 3 | 3 | depends on EXPERIMENTAL && INET |
| 4 | - depends on SYSFS && (IPV6 || IPV6=n) | |
| 5 | - select CONFIGFS_FS | |
| 4 | + depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n) | |
| 6 | 5 | select IP_SCTP |
| 7 | 6 | help |
| 8 | 7 | A general purpose distributed lock manager for kernel or userspace |