Merge 6.3-rc5 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Apr 2023 07:33:30 +0000 (09:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Apr 2023 07:33:30 +0000 (09:33 +0200)
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>
14 files changed:
1  2 
MAINTAINERS
block/genhd.c
drivers/ata/pata_parport/pata_parport.c
drivers/block/ublk_drv.c
drivers/char/tpm/tpm-chip.c
drivers/char/tpm/tpm.h
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
drivers/hwmon/hwmon.c
drivers/i2c/i2c-dev.c
drivers/nvme/host/core.c
drivers/scsi/sd.c
drivers/soc/qcom/rmtfs_mem.c
drivers/tty/vt/vt.c
drivers/vhost/vdpa.c

diff --cc MAINTAINERS
Simple merge
diff --cc block/genhd.c
Simple merge
@@@ -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;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge