linux

iv/linux

History

Bjorn Helgaas 739c4747a2 Merge branch 'pci/misc'

- Add pci_numachip_init() declaration (Krzysztof Wilczyński)

- Allocate pci_dev_str_match_path() string atomically (Dan Carpenter)

- Drop error message when Precision Time Measurement supported but not
  enabled (Jakub Kicinski)

- Correct the pci_iomap.h header guard #endif comment (Jonathan Cameron)

- Add schedule point in proc_bus_pci_read() (Krzysztof Wilczyński)

- Make saved capability state private to core (Bjorn Helgaas)

- Sync __pci_register_driver() stub for CONFIG_PCI=n (Andy Shevchenko)

- Convert sta2x11 from PCI-DMA-API to generic DMA-API (Christophe JAILLET)

* pci/misc:
  x86/PCI: sta2x11: switch from 'pci_' to 'dma_' API
  PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
  PCI: Make saved capability state private to core
  PCI: Add schedule point in proc_bus_pci_read()
  PCI: Correct the pci_iomap.h header guard #endif comment
  PCI/PTM: Remove error message at boot
  PCI: Fix pci_dev_str_match_path() alloc while atomic bug
  x86/PCI: Add pci_numachip_init() declaration

# Conflicts:
#	include/linux/pci.h

2021-09-02 14:56:44 -05:00

aer_inject.c

PCI/AER: Add RCEC AER error injection support

2020-12-05 15:26:02 -06:00

aer.c

PCI: Change the type of probe argument in reset functions

2021-08-18 17:32:42 -05:00

aspm.c

PCI/sysfs: Use sysfs_emit() and sysfs_emit_at() in "show" functions

2021-06-03 22:14:47 -05:00

dpc.c

PCI: pciehp: Ignore Link Down/Up caused by DPC