]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'uek4/xsa157' of git://ca-git.us.oracle.com/linux-konrad-public into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 8 Jan 2016 16:51:39 +0000 (08:51 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 8 Jan 2016 16:51:39 +0000 (08:51 -0800)
commit0f560f4d975f12c28e904b781999eef743fea102
treec0f74e4dde6d12c63178abf789ef764079257bff
parent2b3c3e3ad1208e4df08f52b7a591d6cfccd65e41
parentf9803d28278cdbc5885bc7d50138a18fa028062d
Merge branch 'uek4/xsa157' of git://ca-git.us.oracle.com/linux-konrad-public into topic/uek-4.1/xen

* 'uek4/xsa157' of git://ca-git.us.oracle.com/linux-konrad-public:
  xen/pciback: Don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set.
  xen/pciback: For XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled.
  xen/pciback: Do not install an IRQ handler for MSI interrupts.
  xen/pciback: Return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled
  xen/pciback: Return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled
drivers/xen/xen-pciback/pciback_ops.c