From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 3 Apr 2023 07:33:30 +0000 (+0200)
Subject: Merge 6.3-rc5 into driver-core-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cd8fe5b6dbb3a487bea5f1601437c013a3d56163;p=linux.git

Merge 6.3-rc5 into driver-core-next

We need the fixes in here for testing, as well as the driver core
changes for documentation updates to build on.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cd8fe5b6dbb3a487bea5f1601437c013a3d56163
diff --cc drivers/ata/pata_parport/pata_parport.c
index 64d1bde269402,c1576d943b436..bfc7449fa183e
--- a/drivers/ata/pata_parport/pata_parport.c
+++ b/drivers/ata/pata_parport/pata_parport.c
@@@ -625,11 -630,11 +629,10 @@@ static void pi_remove_one(struct devic
  	pi_disconnect(pi);
  	pi_release(pi);
  	device_unregister(dev);
- 	ida_free(&pata_parport_bus_dev_ids, dev->id);
- 	/* pata_parport_dev_release will do kfree(pi) */
+ 	/* pata_parport_dev_release will do ida_free(dev->id) and kfree(pi) */
  }
  
 -static ssize_t delete_device_store(struct bus_type *bus, const char *buf,
 -				   size_t count)
 +static ssize_t delete_device_store(const struct bus_type *bus, const char *buf, size_t count)
  {
  	struct device *dev;