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

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

Merge tag 'driver-core-3.18-rc1' of... 

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

Pull driver core update from Greg KH:
 "Here's the driver core patches for 3.18-rc1.  Just a few small things,
  and the addition of a new interface to dump firmware "core dumps" to
  userspace through sysfs that the wireless and graphic drivers want to
  use.

  All of these have been in linux-next for a while"

* tag 'driver-core-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  dynamic_debug: change __dynamic_<foo>_dbg return types to void
  driver/base/node: remove unnecessary kfree of node struct from unregister_one_node
  devres: Improve devm_kasprintf()/kvasprintf() support
  Documentation: devres: Add missing devm_kstrdup() managed interface
  Documentation: devres: Add missing IRQ functions
  firmware_class: make sure fw requests contain a name
  driver core: Remove kerneldoc from local function
  attribute_container: fix coding style issues
  attribute_container: fix whitespace errors
  drivers/base: Fix length checks in create_syslog_header()/dev_vprintk_emit()
  device coredump: add new device coredump class
  Documentation/sysfs-rules.txt: Add device attribute error code documentation
parents 683a52a1 906d2015

Documentation/driver-model/devres.txt

+5 −0
Original line number Diff line number Diff line
@@ -281,7 +281,9 @@ IOMAP 


IRQ

  devm_free_irq()

  devm_request_any_context_irq()

  devm_request_irq()

  devm_request_threaded_irq()



MDIO

  devm_mdiobus_alloc()
@@ -291,11 +293,14 @@ MDIO 
MEM

  devm_free_pages()

  devm_get_free_pages()

  devm_kasprintf()

  devm_kcalloc()

  devm_kfree()

  devm_kmalloc()

  devm_kmalloc_array()

  devm_kmemdup()

  devm_kstrdup()

  devm_kvasprintf()

  devm_kzalloc()



PCI

Documentation/sysfs-rules.txt

+21 −0
Original line number Diff line number Diff line
@@ -161,3 +161,24 @@ versions of the sysfs interface. 
  the device that matches the expected subsystem. Depending on a specific

  position of a parent device or exposing relative paths using "../" to

  access the chain of parents is a bug in the application.



- When reading and writing sysfs device attribute files, avoid dependency

  on specific error codes wherever possible. This minimizes coupling to

  the error handling implementation within the kernel.



  In general, failures to read or write sysfs device attributes shall

  propagate errors wherever possible. Common errors include, but are not

  limited to:



  -EIO: The read or store operation is not supported, typically returned by

        the sysfs system itself if the read or store pointer is NULL.



  -ENXIO: The read or store operation failed



  Error codes will not be changed without good reason, and should a change

  to error codes result in user-space breakage, it will be fixed, or the

  the offending change will be reverted.



  Userspace applications can, however, expect the format and contents of

  the attribute files to remain consistent in the absence of a version

  attribute change in the context of a given attribute.

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2877,6 +2877,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git 
S:	Maintained

F:	drivers/usb/dwc3/



DEVICE COREDUMP (DEV_COREDUMP)

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/base/devcoredump.c

F:	include/linux/devcoredump.h



DEVICE FREQUENCY (DEVFREQ)

M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

drivers/base/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -165,6 +165,27 @@ config FW_LOADER_USER_HELPER_FALLBACK 


	  If you are unsure about this, say N here.



config WANT_DEV_COREDUMP

	bool

	help

	  Drivers should "select" this option if they desire to use the

	  device coredump mechanism.



config DISABLE_DEV_COREDUMP

	bool "Disable device coredump" if EXPERT

	help

	  Disable the device coredump mechanism despite drivers wanting to

	  use it; this allows for more sensitive systems or systems that

	  don't want to ever access the information to not have the code,

	  nor keep any data.



	  If unsure, say N.



config DEV_COREDUMP

	bool

	default y if WANT_DEV_COREDUMP

	depends on !DISABLE_DEV_COREDUMP



config DEBUG_DRIVER

	bool "Driver Core verbose debug messages"

	depends on DEBUG_KERNEL

drivers/base/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o 
obj-$(CONFIG_REGMAP)	+= regmap/

obj-$(CONFIG_SOC_BUS) += soc.o

obj-$(CONFIG_PINCTRL) += pinctrl.o

obj-$(CONFIG_DEV_COREDUMP) += devcoredump.o



ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG