]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30aa669 6300aa7)
Merge branch 'stable/xen-pciback-0.6.3.bugfixes' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 19 Apr 2012 21:08:38 +0000 (17:08 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 19 Apr 2012 21:08:38 +0000 (17:08 -0400)
* stable/xen-pciback-0.6.3.bugfixes:
  xen/pcifront: avoid pci_frontend_enable_msix() falsely returning success
  xen/pciback: fix XEN_PCI_OP_enable_msix result
  xen/pciback: Support pci_reset_function, aka FLR or D3 support.
  PCI: Introduce __pci_reset_function_locked to be used when holding device_lock.

1  2 
drivers/pci/pci.c patch | diff1 | diff2 | blob | history
drivers/pci/xen-pcifront.c patch | diff1 | diff2 | blob | history
drivers/xen/xen-pciback/pci_stub.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/xen-pcifront.c
Simple merge
diff --cc drivers/xen/xen-pciback/pci_stub.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.