Commit 205d0494 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull driver core fixes from Greg KH:
 "Here is a single driver core fix for a much-reported-by-sysbot issue
  that showed up in 6.6-rc1. It's been submitted by many people, all in
  the same way, so it obviously fixes things for them all.

  Also in here is a single documentation update adding riscv to the
  embargoed hardware document in case there are any future issues with
  that processor family.

  Both of these have been in linux-next with no reported problems"

* tag 'driver-core-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  Documentation: embargoed-hardware-issues.rst: Add myself for RISC-V
  driver core: return an error when dev_set_name() hasn't happened
parents fd455e77 139e0818

Documentation/process/embargoed-hardware-issues.rst

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ an involved disclosed party. The current ambassadors list: 
  IBM Z		Christian Borntraeger <borntraeger@de.ibm.com>

  Intel		Tony Luck <tony.luck@intel.com>

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>

  RISC-V	Palmer Dabbelt <palmer@dabbelt.com>

  Samsung	Javier González <javier.gonz@samsung.com>



  Microsoft	James Morris <jamorris@linux.microsoft.com>

drivers/base/core.c

+2 −0
Original line number Diff line number Diff line
@@ -3537,6 +3537,8 @@ int device_add(struct device *dev) 
	/* subsystems can specify simple device enumeration */

	else if (dev->bus && dev->bus->dev_name)

		error = dev_set_name(dev, "%s%u", dev->bus->dev_name, dev->id);

	else

		error = -EINVAL;

	if (error)

		goto name_error;