diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 20:59:09 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 20:59:09 +0300 |
| commit | 8ab064e93103592bb38f8e77d52e15561df619ec (patch) | |
| tree | 941fde10a82dabb1b216e03dd0021b0fc2d7cae9 /net/llc | |
| parent | 15d5a0157f31a874c94a0c8142c9bd7d494cb374 (diff) | |
| parent | 11fdcf05032812bd23cdc42850d1f650376ec09d (diff) | |
| download | linux-8ab064e93103592bb38f8e77d52e15561df619ec.tar.xz | |
Merge branch 'pci/enumeration'
- Fix pci_register_host_bridge() device_register() error handling (Rob
Herring)
- Fix pci_host_bridge struct device release/free handling (Rob Herring)
- Program MPS for RCiEP devices (Ashok Raj)
- Inherit PTM settings from Switch Upstream Port so we can enable PTM on
Endpoints (Bjorn Helgaas)
- Add #defines for bridge windows (PCI_BRIDGE_IO_WINDOW,
PCI_BRIDGE_MEM_WINDOW, etc) (Krzysztof Wilczynski)
* pci/enumeration:
pcmcia: Use CardBus window names (PCI_CB_BRIDGE_IO_0_WINDOW etc) when freeing
PCI: Use bridge window names (PCI_BRIDGE_IO_WINDOW etc)
PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port
PCI: Program MPS for RCiEP devices
PCI: Fix pci_host_bridge struct device release/free handling
PCI: Fix pci_register_host_bridge() device_register() error handling
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions