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

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

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

Pull driver core changes from Greg KH:
 "Here is the small set of driver core and debugfs updates for 5.14-rc1.

  Included in here are:

   - debugfs api cleanups (touched some drivers)

   - devres updates

   - tiny driver core updates and tweaks

  Nothing major in here at all, and all have been in linux-next for a
  while with no reported issues"

* tag 'driver-core-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (27 commits)
  docs: ABI: testing: sysfs-firmware-memmap: add some memmap types.
  devres: Enable trace events
  devres: No need to call remove_nodes() when there none present
  devres: Use list_for_each_safe_from() in remove_nodes()
  devres: Make locking straight forward in release_nodes()
  kernfs: move revalidate to be near lookup
  drivers/base: Constify static attribute_group structs
  firmware_loader: remove unneeded 'comma' macro
  devcoredump: remove contact information
  driver core: Drop helper devm_platform_ioremap_resource_wc()
  component: Rename 'dev' to 'parent'
  component: Drop 'dev' argument to component_match_realloc()
  device property: Don't check for NULL twice in the loops
  driver core: auxiliary bus: Fix typo in the docs
  drivers/base/node.c: make CACHE_ATTR define static DEVICE_ATTR_RO
  debugfs: remove return value of debugfs_create_ulong()
  debugfs: remove return value of debugfs_create_bool()
  scsi: snic: debugfs: remove local storage of debugfs files
  b43: don't save dentries for debugfs
  b43legacy: don't save dentries for debugfs
  ...
parents eed0218e 3b1f9415

Documentation/ABI/testing/sysfs-firmware-memmap

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ Description: 
		  - System RAM

		  - ACPI Tables

		  - ACPI Non-volatile Storage

		  - Unusable memory

		  - Persistent Memory (legacy)

		  - Persistent Memory

		  - Soft Reserved

		  - reserved



		Following shell snippet can be used to display that memory

Documentation/driver-api/auxiliary_bus.rst

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ too complex for a single device to be managed by a monolithic driver 
(e.g. Sound Open Firmware), multiple devices might implement a common

intersection of functionality (e.g. NICs + RDMA), or a driver may want to

export an interface for another subsystem to drive (e.g. SIOV Physical Function

export Virtual Function management).  A split of the functinoality into child-

export Virtual Function management).  A split of the functionality into child-

devices representing sub-domains of functionality makes it possible to

compartmentalize, layer, and distribute domain-specific concerns via a Linux

device-driver model.

Documentation/driver-api/driver-model/devres.rst

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ IOMAP 
  devm_ioremap_resource() : checks resource, requests memory region, ioremaps

  devm_ioremap_resource_wc()

  devm_platform_ioremap_resource() : calls devm_ioremap_resource() for platform device

  devm_platform_ioremap_resource_wc()

  devm_platform_ioremap_resource_byname()

  devm_platform_get_and_ioremap_resource()

  devm_iounmap()

Documentation/filesystems/debugfs.rst

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ and hexadecimal:: 


Boolean values can be placed in debugfs with::



    struct dentry *debugfs_create_bool(const char *name, umode_t mode,

    void debugfs_create_bool(const char *name, umode_t mode,

                             struct dentry *parent, bool *value);



A read on the resulting file will yield either Y (for non-zero values) or

drivers/base/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -30,3 +30,6 @@ obj-y += test/ 


ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG



# define_trace.h needs to know how to find our header

CFLAGS_trace.o		:= -I$(src)

obj-$(CONFIG_TRACING)	+= trace.o