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

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

Pull driver core updates from Greg KH:
 "Here's the driver-core / kobject / lz4 tree update for 4.1-rc1.

  Everything here has been in linux-next for a while with no reported
  issues.  It's mostly just coding style cleanups, with other minor
  changes in here as well, nothing big"

* tag 'driver-core-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (32 commits)
  debugfs: allow bad parent pointers to be passed in
  stable_kernel_rules: Add clause about specification of kernel versions to patch.
  kobject: WARN as tip when call kobject_get() to a kobject not initialized
  lib/lz4: Pull out constant tables
  drivers: platform: parse IRQ flags from resources
  driver core: Make probe deferral more quiet
  drivers/core/of: Add symlink to device-tree from devices with an OF node
  device: Add dev_of_node() accessor
  drivers: base: fw: fix ret value when loading fw
  firmware: Avoid manual device_create_file() calls
  drivers/base: cacheinfo: validate device node for all the caches
  drivers/base: use tabs where possible in code indentation
  driver core: add missing blank line after declaration
  drivers: base: node: Delete space after pointer declaration
  drivers: base: memory: Use tabs instead of spaces
  firmware_class: Fix whitespace and indentation
  drivers: base: dma-mapping: Erase blank space after pointer
  drivers: base: class: Add a blank line after declarations
  attribute_container: fix missing blank lines after declarations
  drivers: base: memory: Fix switch indent
  ...
parents 42e3a58b c9e15f25

Documentation/ABI/stable/sysfs-devices

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# Note: This documents additional properties of any device beyond what

# is documented in Documentation/sysfs-rules.txt



What:		/sys/devices/*/of_path

Date:		February 2015

Contact:	Device Tree mailing list <devicetree@vger.kernel.org>

Description:

		Any device associated with a device-tree node will have

		an of_path symlink pointing to the corresponding device

		node in /sys/firmware/devicetree/

Documentation/stable_kernel_rules.txt

+10 −0
Original line number Diff line number Diff line
@@ -81,6 +81,16 @@ format in the sign-off area: 
     git cherry-pick fd21073

     git cherry-pick <this commit>



Also, some patches may have kernel version prerequisites.  This can be

specified in the following format in the sign-off area:



     Cc:  <stable@vger.kernel.org> # 3.3.x-



   The tag has the meaning of:

     git cherry-pick <this commit>



   For each "-stable" tree starting with the specified version.



Following the submission:



 - The sender will receive an ACK when the patch has been accepted into the

drivers/base/attribute_container.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ int 
attribute_container_unregister(struct attribute_container *cont)

{

	int retval = -EBUSY;



	mutex_lock(&attribute_container_mutex);

	spin_lock(&cont->containers.k_lock);

	if (!list_empty(&cont->containers.k_list))
@@ -349,6 +350,7 @@ int 
attribute_container_add_class_device(struct device *classdev)

{

	int error = device_add(classdev);



	if (error)

		return error;

	return attribute_container_add_attrs(classdev);

drivers/base/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -515,11 +515,11 @@ int bus_add_device(struct device *dev) 
			goto out_put;

		error = device_add_groups(dev, bus->dev_groups);

		if (error)

			goto out_groups;

			goto out_id;

		error = sysfs_create_link(&bus->p->devices_kset->kobj,

						&dev->kobj, dev_name(dev));

		if (error)

			goto out_id;

			goto out_groups;

		error = sysfs_create_link(&dev->kobj,

				&dev->bus->p->subsys.kobj, "subsystem");

		if (error)

drivers/base/cacheinfo.c

+11 −2
Original line number Diff line number Diff line
@@ -62,15 +62,21 @@ static int cache_setup_of_node(unsigned int cpu) 
		return -ENOENT;

	}



	while (np && index < cache_leaves(cpu)) {

	while (index < cache_leaves(cpu)) {

		this_leaf = this_cpu_ci->info_list + index;

		if (this_leaf->level != 1)

			np = of_find_next_cache_node(np);

		else

			np = of_node_get(np);/* cpu node itself */

		if (!np)

			break;

		this_leaf->of_node = np;

		index++;

	}



	if (index != cache_leaves(cpu)) /* not all OF nodes populated */

		return -ENOENT;



	return 0;

}
@@ -189,8 +195,11 @@ static int detect_cache_attributes(unsigned int cpu) 
	 * will be set up here only if they are not populated already

	 */

	ret = cache_shared_cpu_map_setup(cpu);

	if (ret)

	if (ret) {

		pr_warn("Unable to detect cache hierarcy from DT for CPU %d\n",

			cpu);

		goto free_ci;

	}

	return 0;



free_ci:

CRA Git | Maintained and supported by SUSTech CRA and CCSE