projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a48e486 9c2cc57)
Merge branch 'pci/pm'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Dec 2020 21:11:08 +0000 (15:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Dec 2020 21:11:08 +0000 (15:11 -0600)
- Add sysfs attribute for device power state (Maximilian Luz)

- Rename pci_wakeup_bus() to pci_resume_bus() (Mika Westerberg)

- Do not generate wakeup event when runtime resuming bus (Mika Westerberg)

* pci/pm:
  PCI/PM: Do not generate wakeup event when runtime resuming device
  PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()
  PCI: Add sysfs attribute for device power state

1  2 
drivers/pci/pci.c patch | diff1 | diff2 | blob | history
include/linux/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
Domain: System / Kernel;