Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a335bc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 11537421 7b1fff7e

drivers/net/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -3389,8 +3389,7 @@ config NETCONSOLE 


config NETCONSOLE_DYNAMIC

	bool "Dynamic reconfiguration of logging targets"

	depends on NETCONSOLE && SYSFS

	select CONFIGFS_FS

	depends on NETCONSOLE && SYSFS && CONFIGFS_FS

	help

	  This option enables the ability to dynamically reconfigure target

	  parameters (interface, IP addresses, port numbers, MAC addresses)

fs/configfs/Kconfig

+2 −2
Original line number Diff line number Diff line 
config CONFIGFS_FS

	tristate "Userspace-driven configuration filesystem"

	depends on SYSFS

	select SYSFS

	help

	  configfs is a ram-based filesystem that provides the converse

	  configfs is a RAM-based filesystem that provides the converse

	  of sysfs's functionality. Where sysfs is a filesystem-based

	  view of kernel objects, configfs is a filesystem-based manager

	  of kernel objects, or config_items.

fs/dlm/Kconfig

+1 −2
Original line number Diff line number Diff line 
menuconfig DLM

	tristate "Distributed Lock Manager (DLM)"

	depends on EXPERIMENTAL && INET

	depends on SYSFS && (IPV6 || IPV6=n)

	select CONFIGFS_FS

	depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n)

	select IP_SCTP

	help

	A general purpose distributed lock manager for kernel or userspace

fs/ocfs2/Kconfig

+1 −2
Original line number Diff line number Diff line 
config OCFS2_FS

	tristate "OCFS2 file system support"

	depends on NET && SYSFS

	select CONFIGFS_FS

	depends on NET && SYSFS && CONFIGFS_FS

	select JBD2

	select CRC32

	select QUOTA