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

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

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

Pull driver core updates from Greg KH:
 "Here is the driver core / firmware changes for 4.2-rc1.

  A number of small changes all over the place in the driver core, and
  in the firmware subsystem.  Nothing really major, full details in the
  shortlog.  Some of it is a bit of churn, given that the platform
  driver probing changes was found to not work well, so they were
  reverted.

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

* tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (31 commits)
  Revert "base/platform: Only insert MEM and IO resources"
  Revert "base/platform: Continue on insert_resource() error"
  Revert "of/platform: Use platform_device interface"
  Revert "base/platform: Remove code duplication"
  firmware: add missing kfree for work on async call
  fs: sysfs: don't pass count == 0 to bin file readers
  base:dd - Fix for typo in comment to function driver_deferred_probe_trigger().
  base/platform: Remove code duplication
  of/platform: Use platform_device interface
  base/platform: Continue on insert_resource() error
  base/platform: Only insert MEM and IO resources
  firmware: use const for remaining firmware names
  firmware: fix possible use after free on name on asynchronous request
  firmware: check for file truncation on direct firmware loading
  firmware: fix __getname() missing failure check
  drivers: of/base: move of_init to driver_init
  drivers/base: cacheinfo: fix annoying typo when DT nodes are absent
  sysfs: disambiguate between "error code" and "failure" in comments
  driver-core: fix build for !CONFIG_MODULES
  driver-core: make __device_attach() static
  ...
parents d8782381 0e6c861f

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ Description: Parameters for the CPU cache attributes 
		coherency_line_size: the minimum amount of data in bytes that gets

				     transferred from memory to cache



		level: the cache hierarcy in the multi-level cache configuration

		level: the cache hierarchy in the multi-level cache configuration



		number_of_sets: total number of sets in the cache, a set is a

				collection of cache lines with the same cache index

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -953,6 +953,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			auto	selects the default scheme, which automatically

				enables eagerfpu restore for xsaveopt.



	module.async_probe [KNL]

			Enable asynchronous probe on this module.



	early_ioremap_debug [KNL]

			Enable debug messages in early_ioremap support. This

			is useful for tracking down temporary early mappings

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -3450,16 +3450,17 @@ F: drivers/block/drbd/ 
F:	lib/lru_cache.c

F:	Documentation/blockdev/drbd/



DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS

DRIVER CORE, KOBJECTS, DEBUGFS, KERNFS AND SYSFS

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git

S:	Supported

F:	Documentation/kobject.txt

F:	drivers/base/

F:	fs/sysfs/

F:	fs/debugfs/

F:	include/linux/kobj*

F:	fs/kernfs/

F:	fs/sysfs/

F:	include/linux/debugfs.h

F:	include/linux/kobj*

F:	lib/kobj*



DRM DRIVERS

arch/powerpc/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int alloc_bootmem_huge_page(struct hstate *hstate) 
unsigned long gpage_npages[MMU_PAGE_COUNT];



static int __init do_gpage_early_setup(char *param, char *val,

				       const char *unused)

				       const char *unused, void *arg)

{

	static phys_addr_t size;

	unsigned long npages;
@@ -385,7 +385,7 @@ void __init reserve_hugetlb_gpages(void) 


	strlcpy(cmdline, boot_command_line, COMMAND_LINE_SIZE);

	parse_args("hugetlb gpages", cmdline, NULL, 0, 0, 0,

			&do_gpage_early_setup);

			NULL, &do_gpage_early_setup);



	/*

	 * Walk gpage list in reverse, allocating larger page sizes first.

drivers/base/base.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static inline int driver_match_device(struct device_driver *drv, 
{

	return drv->bus->match ? drv->bus->match(dev, drv) : 1;

}

extern bool driver_allows_async_probing(struct device_driver *drv);



extern int driver_add_groups(struct device_driver *drv,

			     const struct attribute_group **groups);