diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:14:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:14:25 -0700 |
| commit | 5318991645d78c83dde7a7bb1cba24695cc152c4 (patch) | |
| tree | 68b62302435214105a87e15a970ac1e0df32df86 /drivers/xen | |
| parent | dc93275150da9542f500fbd3d0515eecfefba7f6 (diff) | |
| parent | 7c1bfd685bcdc822ab1d7411ea05c82bd2a7b260 (diff) | |
| parent | d79647aea22732f39c81bbdc80931f96b46023f0 (diff) | |
Merge branches 'stable/backend.base.v3' and 'stable/gntalloc.v7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/backend.base.v3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/pci: Fix compiler error when CONFIG_XEN_PRIVILEGED_GUEST is not set.
xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.
xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.
xen/irq: The Xen hypervisor cleans up the PIRQs if the other domain forgot.
xen/irq: Export 'xen_pirq_from_irq' function.
xen/irq: Add support to check if IRQ line is shared with other domains.
xen/irq: Check if the PCI device is owned by a domain different than DOMID_SELF.
xen/pci: Add xen_[find|register|unregister]_device_domain_owner functions.
* 'stable/gntalloc.v7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/gntdev,gntalloc: Remove unneeded VM flags