From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 23 Jan 2025 19:04:51 +0000 (-0600)
Subject: Merge branch 'pci/pci-sysfs'
X-Git-Tag: v6.14-rc1~90^2~17
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=60b5cd4f82448595aed58f24583308baf86e4565;p=linux-block.git

Merge branch 'pci/pci-sysfs'

- Move reset related sysfs code from pci.c to pci-sysfs.c where other
  similar code lives (Ilpo Järvinen)

- Simplify reset_method_store() memory management by using __free() instead
  of explicit kfree() cleanup (Ilpo Järvinen)

- Drop unnecessary zero initializer (Ilpo Järvinen)

* pci/pci-sysfs:
  PCI/sysfs: Remove unnecessary zero in initializer
  PCI/sysfs: Use __free() in reset_method_store()
  PCI/sysfs: Move reset related sysfs code to correct file
---

60b5cd4f82448595aed58f24583308baf86e4565