Merge branch 'pci/switchtec' into next

Browse source

* pci/switchtec:
  switchtec: Add device IDs for PSX 24xG3 and PSX 48xG3
  switchtec: Add Global Fabric Manager Server (GFMS) event

...

This commit is contained in:

Bjorn Helgaas 2018-01-31 10:13:07 -06:00 • committed by Bjorn Helgaas

parent 414ae7609e bb6b42b4fb

commit 6a436fa812

3 changed files with 8 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/switchtec.h

View file

3

include/uapi/linux/switchtec_ioctl.h

View file