diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-08 09:37:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-08 09:37:58 -0700 |
| commit | 1ab1a19db13cdd05f9df4760e42a1f2f52f13439 (patch) | |
| tree | d7591a70ac1d31fcc1b3b496dca3498d82eb703d /net/unix/af_unix.c | |
| parent | Merge tag 'for-6.9-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff) | |
| parent | PCI/ASPM: Restore parent state to parent, child state to child (diff) | |
| download | wireguard-linux-1ab1a19db13cdd05f9df4760e42a1f2f52f13439.tar.xz wireguard-linux-1ab1a19db13cdd05f9df4760e42a1f2f52f13439.zip | |
Merge tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci fixes from Bjorn Helgaas:
- Update kernel-parameters doc to describe "pcie_aspm=off" more
accurately (Bjorn Helgaas)
- Restore the parent's (not the child's) ASPM state to the parent
during resume, which fixes a reboot during resume (Kai-Heng Feng)
* tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
PCI/ASPM: Restore parent state to parent, child state to child
PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions