diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-02 12:56:56 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-02 12:56:56 -0800 |
commit | b1dd6c26bca4acc145c61f98febadba64eba1877 (patch) | |
tree | b9789a5d6145132997c01c9a370488ec289d06da /MAINTAINERS | |
parent | 9c2f0338bbd132a4b12b988004d796798609d297 (diff) | |
parent | 925bd5e08106bd5bfbd1cb8e124c89a0b4003569 (diff) |
Merge tag 'pci-v6.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci fixes from Bjorn Helgaas:
- Fix a potential deadlock that was reintroduced by an ASPM revert
merged for v6.8 (Johan Hovold)
- Add Manivannan Sadhasivam as PCI Endpoint maintainer (Lorenzo
Pieralisi)
* tag 'pci-v6.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
MAINTAINERS: Add Manivannan Sadhasivam as PCI Endpoint maintainer
PCI/ASPM: Fix deadlock when enabling ASPM
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 722b894f305e..1dc764bd0fdd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16862,9 +16862,8 @@ F: Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml F: drivers/pci/controller/pcie-xilinx-cpm.c PCI ENDPOINT SUBSYSTEM -M: Lorenzo Pieralisi <lpieralisi@kernel.org> +M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> M: Krzysztof WilczyĆski <kw@linux.com> -R: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> R: Kishon Vijay Abraham I <kishon@kernel.org> L: linux-pci@vger.kernel.org S: Supported |