driver core fixes for 4.15-rc3

Here are 3 small fixes for some reported issues:
 	- a debugfs build error that lots of people have reported
 	- a Kconfig help text cleanup now that the firmware is not in
 	  the kernel tree
 	- a isa bus bug fix for a reported issue that has been there
 	  since 2.6.18.
 
 All of these have been in linux-next with no reported issues.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWia7Ag8cZ3JlZ0Brcm9h
 aC5jb20ACgkQMUfUDdst+ymIZACePFa9lQwqJpxToCCm0Z2Yi1x50f0AoNP6TI9g
 mkCgELuNi6QdhvFYIVjW
 =8HAh
 -----END PGP SIGNATURE-----

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

Pull driver core fixes from Greg KH:
 "Here are 3 small fixes for some reported issues:

   - a debugfs build error that lots of people have reported

   - a Kconfig help text cleanup now that the firmware is not in the
     kernel tree

   - an ISA bus bug fix for a reported issue that has been there since
     2.6.18.

  All of these have been in linux-next with no reported issues"

* tag 'driver-core-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  firmware: cleanup FIRMWARE_IN_KERNEL message
  isa: Prevent NULL dereference in isa_bus driver callbacks
  debugfs: fix debugfs_real_fops() build error
This commit is contained in:
Linus Torvalds 2017-12-05 10:00:14 -08:00
commit 1fbd55c0cc
3 changed files with 20 additions and 17 deletions

View file

@ -216,6 +216,8 @@ static inline void debugfs_remove(struct dentry *dentry)
static inline void debugfs_remove_recursive(struct dentry *dentry)
{ }
const struct file_operations *debugfs_real_fops(const struct file *filp);
static inline int debugfs_file_get(struct dentry *dentry)
{
return 0;