From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 19 Sep 2024 19:25:27 +0000 (-0500)
Subject: Merge branch 'pci/sysfs'
X-Git-Tag: v6.12-rc1~96^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed072e447e112f6a6f84e7cc4fc9a1f6e1e653ac;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/sysfs'

- Add ARCH_PCI_DEV_GROUPS so s390 can add its own attribute_groups without
  having to stomp on the core's pdev->dev.groups (Lukas Wunner)

* pci/sysfs:
  s390/pci: Stop usurping pdev->dev.groups
---

ed072e447e112f6a6f84e7cc4fc9a1f6e1e653ac