diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-11-09 16:54:10 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-11-09 16:54:10 -0500 |
| commit | b08a2f34916e06d001288f33b7fc407c04650b43 (patch) | |
| tree | d39fe46ec96cacc4a363d0603b761fb931c5c777 | |
| parent | 19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (diff) | |
| parent | 0247eaf96252353a760cbd3975dd6ef0f57379b3 (diff) | |
| parent | d85c5f36da99b620be09e015e64c7663f5771784 (diff) | |
| parent | e0438b91ba4bfd23a5bb694d72af38ded433eb70 (diff) | |
| parent | c27ff91eab5a78fc32e11930ff42426eab8a4773 (diff) | |
| download | xen-b08a2f34916e06d001288f33b7fc407c04650b43.tar.gz | |
Merge branches 'stable/for-linus-fixes-3.2', 'stable/for-x86', 'stable/for-gregkh-3.2', 'stable/for-x86' and 'devel/pm-idle-fixes-for-3.2' into testing
* stable/for-linus-fixes-3.2:
xen-gntalloc: signedness bug in add_grefs()
xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()
xen-gntdev: integer overflow in gntdev_alloc_map()
xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.
xen/balloon: Avoid OOM when requesting highmem
xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI
xen: map foreign pages for shared rings by updating the PTEs directly
* stable/for-x86:
x86/paravirt: Use pte_val instead of pte_flags on CPA pageattr_test
x86/cpa: Use pte_attrs instead of pte_flags on CPA/set_p.._wb/wc operations.
cpuidle: If disable_cpuidle() is called, set pm_idle to default_idle.
* stable/for-gregkh-3.2:
xen: document balloon driver sysfs files
* stable/for-x86:
x86/paravirt: Use pte_val instead of pte_flags on CPA pageattr_test
x86/cpa: Use pte_attrs instead of pte_flags on CPA/set_p.._wb/wc operations.
cpuidle: If disable_cpuidle() is called, set pm_idle to default_idle.
* devel/pm-idle-fixes-for-3.2:
xen/pvhvm: Use default_idle on pm_idle call.
xen/pm_idle: Make pm_idle call default_idle
cpuidle: If pm_idle is not set and cpuidle is turned off, use the default_idle