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

Commit c636e176 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core fixes from Greg KH:
 "Here are two small driver core / kernfs fixes for 4.9-rc3.

  One makes the Kconfig entry for DEBUG_TEST_DRIVER_REMOVE a bit more
  explicit that this is a crazy thing to enable for a distro kernel
  (thanks for trying Fedora!), the other resolves an issue with vim
  opening kernfs files (sysfs, configfs, etc.)

  Both have been in linux-next with no reported issues"

* tag 'driver-core-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Make Kconfig text for DEBUG_TEST_DRIVER_REMOVE stronger
  kernfs: Add noop_fsync to supported kernfs_file_fops
parents db4a57e6 248ff021

drivers/base/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -213,14 +213,16 @@ config DEBUG_DEVRES 
	  If you are unsure about this, Say N here.



config DEBUG_TEST_DRIVER_REMOVE

	bool "Test driver remove calls during probe"

	bool "Test driver remove calls during probe (UNSTABLE)"

	depends on DEBUG_KERNEL

	help

	  Say Y here if you want the Driver core to test driver remove functions

	  by calling probe, remove, probe. This tests the remove path without

	  having to unbind the driver or unload the driver module.



	  If you are unsure about this, say N here.

	  This option is expected to find errors and may render your system

	  unusable. You should say N here unless you are explicitly looking to

	  test this functionality.



config SYS_HYPERVISOR

	bool

fs/kernfs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -911,6 +911,7 @@ const struct file_operations kernfs_file_fops = { 
	.open		= kernfs_fop_open,

	.release	= kernfs_fop_release,

	.poll		= kernfs_fop_poll,

	.fsync		= noop_fsync,

};



/**