From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 8 Jan 2016 16:51:39 +0000 (-0800)
Subject: Merge branch 'uek4/xsa157' of git://ca-git.us.oracle.com/linux-konrad-public into... 
X-Git-Tag: v4.1.12-92~208^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0f560f4d975f12c28e904b781999eef743fea102;p=users%2Fjedix%2Flinux-maple.git

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
---

0f560f4d975f12c28e904b781999eef743fea102