diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-18 19:52:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-18 19:52:47 -0700 |
| commit | 12566cc35d0e68308bde7aad615743d560cb097b (patch) | |
| tree | 4d059b1ee5955e99a6352cc4a91c57e98280fd98 /fs | |
| parent | 95d0c4277c27520cabdc40646f5a2e507fcd315a (diff) | |
| parent | 67e658794ca191b3221b143f2a1c10d002c40bc8 (diff) | |
| download | blackbird-obmc-linux-12566cc35d0e68308bde7aad615743d560cb097b.tar.gz blackbird-obmc-linux-12566cc35d0e68308bde7aad615743d560cb097b.zip | |
Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These are fixes for two issues:
- The VPD parsing code we added for v4.6 keeps some devices from
crashing, but also keeps cxgb4 from reading non-standard extra VPD
data that is relies on. Hariprasad added a way for the driver to
specify how much VPD is valid.
- The i.MX6 active-low reset GPIO support we added in v4.5 caused
regressions on some boards, so we're reverting that.
VPD:
Add pci_set_vpd_size() (Hariprasad Shenai)
cxgb4: Set VPD size so we can read both VPD structures (Hariprasad Shenai)
Freescale i.MX6 host bridge driver:
Revert "PCI: imx6: Add support for active-low reset GPIO" (Fabio Estevam)"
* tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
cxgb4: Set VPD size so we can read both VPD structures
PCI: Add pci_set_vpd_size() to set VPD size
Revert "PCI: imx6: Add support for active-low reset GPIO"
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
